From 17e8fa8ae56738ea5168dc5bc02f808bd024c072 Mon Sep 17 00:00:00 2001 From: wankai123 Date: Mon, 17 Jan 2022 12:35:25 +0800 Subject: [PATCH] Adjust e2e case for V9 core (#8429) * Adjust e2e case for V9 core * fix swctl install scrip * fix cases of browser, iotdb * fix instance serialize --- CHANGES.md | 1 + .../manual/instance/InstanceTraffic.java | 2 ++ ...wserAppSingleVersionTrafficDispatcher.java | 1 + .../iotdb/query/IoTDBMetadataQueryDAO.java | 5 ++-- test/e2e-v2/cases/alarm/expected/service.yml | 3 ++ .../e2e-v2/cases/browser/expected/service.yml | 3 ++ .../e2e-v2/cases/browser/expected/version.yml | 1 + .../expected/service-instance-consumer.yml | 1 + .../expected/service-instance-provider.yml | 1 + .../e2e-v2/cases/cluster/expected/service.yml | 6 ++++ .../expected/service-instance-consumer.yml | 1 + .../expected/service-instance-provider.yml | 2 ++ .../e2e-v2/cases/gateway/expected/service.yml | 6 ++++ .../cases/go/expected/service-instance-go.yml | 1 + .../go/expected/service-instance-provider.yml | 3 +- test/e2e-v2/cases/go/expected/service.yml | 9 ++++++ .../metrics/expected/service-instance.yml | 1 + .../cases/istio/metrics/expected/service.yml | 30 +++++++++++++++---- .../kafka/meter/expected/service-instance.yml | 1 + .../cases/kafka/meter/expected/service.yml | 3 ++ .../cases/log/expected/service-instance.yml | 3 +- test/e2e-v2/cases/log/expected/service.yml | 5 +++- test/e2e-v2/cases/log/log-cases.yaml | 2 +- .../lua/expected/service-instance-nginx.yml | 3 +- .../cases/lua/expected/service-instance.yml | 3 +- test/e2e-v2/cases/lua/expected/service.yml | 11 ++++++- .../cases/meter/expected/service-instance.yml | 1 + test/e2e-v2/cases/meter/expected/service.yml | 3 ++ .../service-instance-consumer-nodejs.yml | 1 + .../service-instance-provider-nodejs.yml | 1 + test/e2e-v2/cases/nodejs/expected/service.yml | 9 ++++++ test/e2e-v2/cases/php/e2e.yaml | 5 +++- test/e2e-v2/cases/php/expected/layer.yml | 19 ++++++++++++ .../php/expected/service-instance-php.yml | 1 + .../expected/service-instance-provider.yml | 3 +- test/e2e-v2/cases/php/expected/service.yml | 6 ++++ .../profile/expected/service-instance.yml | 1 + .../e2e-v2/cases/profile/expected/service.yml | 3 ++ .../service-instance-consumer-java.yml | 1 + .../expected/service-instance-consumer-py.yml | 1 + .../service-instance-provider-py-kafka.yml | 1 + .../expected/service-instance-provider-py.yml | 1 + test/e2e-v2/cases/python/expected/service.yml | 12 ++++++++ .../expected/service-instance.yml | 1 + .../native-protocols/expected/service.yml | 6 ++++ test/e2e-v2/cases/simple/expected/layer.yml | 19 ++++++++++++ .../expected/service-instance-consumer.yml | 1 + .../expected/service-instance-provider.yml | 3 +- test/e2e-v2/cases/simple/expected/service.yml | 12 ++++++++ test/e2e-v2/cases/simple/simple-cases.yaml | 3 ++ test/e2e-v2/cases/so11y/expected/layer.yml | 20 +++++++++++++ .../so11y/expected/satellite-service.yml | 7 +++-- .../cases/so11y/expected/service-instance.yml | 3 +- test/e2e-v2/cases/so11y/expected/service.yml | 19 ++++++++++-- test/e2e-v2/cases/so11y/satellite-cases.yaml | 4 +-- test/e2e-v2/cases/so11y/so11y-cases.yaml | 3 ++ test/e2e-v2/cases/storage/expected/layer.yml | 19 ++++++++++++ .../storage/expected/service-instance.yml | 1 + .../e2e-v2/cases/storage/expected/service.yml | 6 ++++ test/e2e-v2/cases/storage/storage-cases.yaml | 5 +++- test/e2e-v2/cases/vm/expected/service.yml | 5 +++- test/e2e-v2/script/env | 2 +- .../prepare/setup-e2e-shell/install-swctl.sh | 4 +-- 63 files changed, 290 insertions(+), 30 deletions(-) create mode 100644 test/e2e-v2/cases/php/expected/layer.yml create mode 100644 test/e2e-v2/cases/simple/expected/layer.yml create mode 100644 test/e2e-v2/cases/so11y/expected/layer.yml create mode 100644 test/e2e-v2/cases/storage/expected/layer.yml diff --git a/CHANGES.md b/CHANGES.md index 9faad2a6bd..84476ebf67 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -29,6 +29,7 @@ Release Notes. * Follow protocol grammar fix `GCPhrase -> GCPhase`. * Set layer to mesh relation. * Add `FAAS` to SpanLayer. +* Adjust e2e case for V9 core. * Support ZGC GC time and count metric collecting. * Sync proto buffers files from upstream Envoy (Related to https://github.com/envoyproxy/envoy/pull/18955). diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java index 97b00eb92e..0d21ddce74 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java @@ -106,6 +106,7 @@ public class InstanceTraffic extends Metrics { public void deserialize(final RemoteData remoteData) { setServiceId(remoteData.getDataStrings(0)); setName(remoteData.getDataStrings(1)); + setLayer(Layer.valueOf(remoteData.getDataIntegers(0))); final String propString = remoteData.getDataStrings(2); if (StringUtil.isNotEmpty(propString)) { setProperties(GSON.fromJson(propString, JsonObject.class)); @@ -119,6 +120,7 @@ public class InstanceTraffic extends Metrics { final RemoteData.Builder builder = RemoteData.newBuilder(); builder.addDataStrings(serviceId); builder.addDataStrings(name); + builder.addDataIntegers(layer.value()); if (properties == null) { builder.addDataStrings(Const.EMPTY_STRING); } else { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/instance/BrowserAppSingleVersionTrafficDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/instance/BrowserAppSingleVersionTrafficDispatcher.java index 7ea9b3df8f..27363f756a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/instance/BrowserAppSingleVersionTrafficDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/instance/BrowserAppSingleVersionTrafficDispatcher.java @@ -31,6 +31,7 @@ public class BrowserAppSingleVersionTrafficDispatcher extends BrowserAppTrafficS traffic.setName(source.getName()); traffic.setServiceId(source.getServiceId()); traffic.setLastPingTimestamp(source.getTimeBucket()); + traffic.setLayer(source.getLayer()); MetricsStreamProcessor.getInstance().in(traffic); } } diff --git a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBMetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBMetadataQueryDAO.java index 58bc8a79b8..f261e97247 100644 --- a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBMetadataQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBMetadataQueryDAO.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.skywalking.oap.server.core.analysis.Layer; import org.apache.skywalking.oap.server.core.analysis.TimeBucket; import org.apache.skywalking.oap.server.core.analysis.manual.endpoint.EndpointTraffic; import org.apache.skywalking.oap.server.core.analysis.manual.instance.InstanceTraffic; @@ -59,7 +60,7 @@ public class IoTDBMetadataQueryDAO implements IMetadataQueryDAO { query = client.addModelPath(query, ServiceTraffic.INDEX_NAME); Map indexAndValueMap = new HashMap<>(); if (StringUtil.isNotEmpty(layer)) { - indexAndValueMap.put(IoTDBIndexes.LAYER_IDX, layer); + indexAndValueMap.put(IoTDBIndexes.LAYER_IDX, String.valueOf(Layer.valueOf(layer).value())); } if (StringUtil.isNotEmpty(group)) { indexAndValueMap.put(IoTDBIndexes.GROUP_IDX, group); @@ -168,7 +169,7 @@ public class IoTDBMetadataQueryDAO implements IMetadataQueryDAO { serviceInstance.setId(instanceTraffic.id()); serviceInstance.setName(instanceTraffic.getName()); serviceInstance.setInstanceUUID(serviceInstance.getId()); - serviceInstance.setLayer(serviceInstance.getLayer()); + serviceInstance.setLayer(instanceTraffic.getLayer().name()); JsonObject properties = instanceTraffic.getProperties(); if (properties != null) { diff --git a/test/e2e-v2/cases/alarm/expected/service.yml b/test/e2e-v2/cases/alarm/expected/service.yml index 3a333487d9..5c4be35cec 100644 --- a/test/e2e-v2/cases/alarm/expected/service.yml +++ b/test/e2e-v2/cases/alarm/expected/service.yml @@ -17,4 +17,7 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/browser/expected/service.yml b/test/e2e-v2/cases/browser/expected/service.yml index b81f77fbca..60377af8ad 100644 --- a/test/e2e-v2/cases/browser/expected/service.yml +++ b/test/e2e-v2/cases/browser/expected/service.yml @@ -16,3 +16,6 @@ - id: {{ b64enc "test-ui" }}.1 name: test-ui group: "" + shortname: test-ui + layers: + - BROWSER diff --git a/test/e2e-v2/cases/browser/expected/version.yml b/test/e2e-v2/cases/browser/expected/version.yml index ad097edc9e..34eb6e3455 100644 --- a/test/e2e-v2/cases/browser/expected/version.yml +++ b/test/e2e-v2/cases/browser/expected/version.yml @@ -18,3 +18,4 @@ attributes: [] language: UNKNOWN instanceuuid: {{ b64enc "test-ui" }}.1_{{ b64enc "v1.0.0" }} + layer: BROWSER diff --git a/test/e2e-v2/cases/cluster/expected/service-instance-consumer.yml b/test/e2e-v2/cases/cluster/expected/service-instance-consumer.yml index 7d1d199a7a..9b5f754f54 100644 --- a/test/e2e-v2/cases/cluster/expected/service-instance-consumer.yml +++ b/test/e2e-v2/cases/cluster/expected/service-instance-consumer.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/cluster/expected/service-instance-provider.yml b/test/e2e-v2/cases/cluster/expected/service-instance-provider.yml index e5252050a3..d862e0c3a0 100644 --- a/test/e2e-v2/cases/cluster/expected/service-instance-provider.yml +++ b/test/e2e-v2/cases/cluster/expected/service-instance-provider.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/cluster/expected/service.yml b/test/e2e-v2/cases/cluster/expected/service.yml index 20e26bcb0b..d3acfc1e9c 100644 --- a/test/e2e-v2/cases/cluster/expected/service.yml +++ b/test/e2e-v2/cases/cluster/expected/service.yml @@ -17,7 +17,13 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/gateway/expected/service-instance-consumer.yml b/test/e2e-v2/cases/gateway/expected/service-instance-consumer.yml index 7d1d199a7a..9b5f754f54 100644 --- a/test/e2e-v2/cases/gateway/expected/service-instance-consumer.yml +++ b/test/e2e-v2/cases/gateway/expected/service-instance-consumer.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/gateway/expected/service-instance-provider.yml b/test/e2e-v2/cases/gateway/expected/service-instance-provider.yml index a4cbe2c1ef..6dc4522e76 100644 --- a/test/e2e-v2/cases/gateway/expected/service-instance-provider.yml +++ b/test/e2e-v2/cases/gateway/expected/service-instance-provider.yml @@ -37,6 +37,7 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} + layer: GENERAL - id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }} name: provider2 attributes: @@ -58,4 +59,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/gateway/expected/service.yml b/test/e2e-v2/cases/gateway/expected/service.yml index 20e26bcb0b..d3acfc1e9c 100644 --- a/test/e2e-v2/cases/gateway/expected/service.yml +++ b/test/e2e-v2/cases/gateway/expected/service.yml @@ -17,7 +17,13 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/go/expected/service-instance-go.yml b/test/e2e-v2/cases/go/expected/service-instance-go.yml index 07aa13b305..3f1388d31a 100644 --- a/test/e2e-v2/cases/go/expected/service-instance-go.yml +++ b/test/e2e-v2/cases/go/expected/service-instance-go.yml @@ -31,4 +31,5 @@ {{- end}} language: GO instanceuuid: {{ notEmpty .instanceuuid }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/go/expected/service-instance-provider.yml b/test/e2e-v2/cases/go/expected/service-instance-provider.yml index f9296e43bb..d862e0c3a0 100644 --- a/test/e2e-v2/cases/go/expected/service-instance-provider.yml +++ b/test/e2e-v2/cases/go/expected/service-instance-provider.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} -{{- end}} \ No newline at end of file + layer: GENERAL +{{- end}} diff --git a/test/e2e-v2/cases/go/expected/service.yml b/test/e2e-v2/cases/go/expected/service.yml index 38b4a60abd..8411651c27 100644 --- a/test/e2e-v2/cases/go/expected/service.yml +++ b/test/e2e-v2/cases/go/expected/service.yml @@ -17,10 +17,19 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL - id: {{ b64enc "go2sky" }}.1 name: go2sky group: "" + shortname: go2sky + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/istio/metrics/expected/service-instance.yml b/test/e2e-v2/cases/istio/metrics/expected/service-instance.yml index 658cdbd553..05b3ccdac7 100644 --- a/test/e2e-v2/cases/istio/metrics/expected/service-instance.yml +++ b/test/e2e-v2/cases/istio/metrics/expected/service-instance.yml @@ -19,4 +19,5 @@ attributes: [] language: UNKNOWN instanceuuid: {{ notEmpty .instanceuuid }} + layer: GENERAL {{- end }} diff --git a/test/e2e-v2/cases/istio/metrics/expected/service.yml b/test/e2e-v2/cases/istio/metrics/expected/service.yml index 47194f3c13..845739d77e 100644 --- a/test/e2e-v2/cases/istio/metrics/expected/service.yml +++ b/test/e2e-v2/cases/istio/metrics/expected/service.yml @@ -16,20 +16,38 @@ {{- contains . }} - id: {{ b64enc "istio-dp::e2e::istio-egressgateway" }}.1 name: istio-dp::e2e::istio-egressgateway - group: "" + group: "istio-dp" + shortname: e2e::istio-egressgateway + layers: + - GENERAL - id: {{ b64enc "istio-dp::e2e::istio-ingressgateway" }}.1 name: istio-dp::e2e::istio-ingressgateway - group: "" + group: "istio-dp" + shortname: e2e::istio-ingressgateway + layers: + - GENERAL - id: {{ b64enc "istio-dp::e2e::reviews" }}.1 name: istio-dp::e2e::reviews - group: "" + group: "istio-dp" + shortname: e2e::reviews + layers: + - GENERAL - id: {{ b64enc "istio-dp::e2e::productpage" }}.1 name: istio-dp::e2e::productpage - group: "" + group: "istio-dp" + shortname: e2e::productpage + layers: + - GENERAL - id: {{ b64enc "istio-dp::e2e::details" }}.1 name: istio-dp::e2e::details - group: "" + group: "istio-dp" + shortname: e2e::details + layers: + - GENERAL - id: {{ b64enc "istio-dp::e2e::ratings" }}.1 name: istio-dp::e2e::ratings - group: "" + group: "istio-dp" + shortname: e2e::ratings + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/kafka/meter/expected/service-instance.yml b/test/e2e-v2/cases/kafka/meter/expected/service-instance.yml index e5252050a3..d862e0c3a0 100644 --- a/test/e2e-v2/cases/kafka/meter/expected/service-instance.yml +++ b/test/e2e-v2/cases/kafka/meter/expected/service-instance.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/kafka/meter/expected/service.yml b/test/e2e-v2/cases/kafka/meter/expected/service.yml index 3a333487d9..5c4be35cec 100644 --- a/test/e2e-v2/cases/kafka/meter/expected/service.yml +++ b/test/e2e-v2/cases/kafka/meter/expected/service.yml @@ -17,4 +17,7 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/log/expected/service-instance.yml b/test/e2e-v2/cases/log/expected/service-instance.yml index 652b013713..0ec1a99e2e 100644 --- a/test/e2e-v2/cases/log/expected/service-instance.yml +++ b/test/e2e-v2/cases/log/expected/service-instance.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} -{{- end}} \ No newline at end of file + layer: GENERAL +{{- end}} diff --git a/test/e2e-v2/cases/log/expected/service.yml b/test/e2e-v2/cases/log/expected/service.yml index 25f310ffe0..5c4be35cec 100644 --- a/test/e2e-v2/cases/log/expected/service.yml +++ b/test/e2e-v2/cases/log/expected/service.yml @@ -17,4 +17,7 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" -{{- end }} \ No newline at end of file + shortname: e2e-service-provider + layers: + - GENERAL +{{- end }} diff --git a/test/e2e-v2/cases/log/log-cases.yaml b/test/e2e-v2/cases/log/log-cases.yaml index 05d011663f..aca5691a28 100644 --- a/test/e2e-v2/cases/log/log-cases.yaml +++ b/test/e2e-v2/cases/log/log-cases.yaml @@ -15,7 +15,7 @@ cases: # service list - - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls + - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer GENERAL expected: expected/service.yml # service endpoint - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql endpoint list --keyword=users --service-name=e2e-service-provider diff --git a/test/e2e-v2/cases/lua/expected/service-instance-nginx.yml b/test/e2e-v2/cases/lua/expected/service-instance-nginx.yml index c7b910ec66..7ad01b9d1e 100644 --- a/test/e2e-v2/cases/lua/expected/service-instance-nginx.yml +++ b/test/e2e-v2/cases/lua/expected/service-instance-nginx.yml @@ -37,4 +37,5 @@ {{- end}} language: LUA instanceuuid: {{ b64enc "User_Service_Name" }}.1_{{ b64enc "User_Service_Instance_Name" }} -{{- end}} \ No newline at end of file + layer: GENERAL +{{- end}} diff --git a/test/e2e-v2/cases/lua/expected/service-instance.yml b/test/e2e-v2/cases/lua/expected/service-instance.yml index bdc121e0db..d029146b83 100644 --- a/test/e2e-v2/cases/lua/expected/service-instance.yml +++ b/test/e2e-v2/cases/lua/expected/service-instance.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-entry-provider" }}.1_{{ b64enc "provider1" }} -{{- end}} \ No newline at end of file + layer: GENERAL +{{- end}} diff --git a/test/e2e-v2/cases/lua/expected/service.yml b/test/e2e-v2/cases/lua/expected/service.yml index 32f9baccd6..45a84899f2 100644 --- a/test/e2e-v2/cases/lua/expected/service.yml +++ b/test/e2e-v2/cases/lua/expected/service.yml @@ -17,10 +17,19 @@ - id: {{ b64enc "e2e-service-entry-provider" }}.1 name: e2e-service-entry-provider group: "" + shortname: e2e-service-entry-provider + layers: + - GENERAL - id: {{ b64enc "User_Service_Name" }}.1 name: User_Service_Name group: "" + shortname: User_Service_Name + layers: + - GENERAL - id: {{ b64enc "e2e-service-end-provider" }}.1 name: e2e-service-end-provider group: "" -{{- end }} \ No newline at end of file + shortname: e2e-service-end-provider + layers: + - GENERAL +{{- end }} diff --git a/test/e2e-v2/cases/meter/expected/service-instance.yml b/test/e2e-v2/cases/meter/expected/service-instance.yml index e5252050a3..d862e0c3a0 100644 --- a/test/e2e-v2/cases/meter/expected/service-instance.yml +++ b/test/e2e-v2/cases/meter/expected/service-instance.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/meter/expected/service.yml b/test/e2e-v2/cases/meter/expected/service.yml index 3a333487d9..5c4be35cec 100644 --- a/test/e2e-v2/cases/meter/expected/service.yml +++ b/test/e2e-v2/cases/meter/expected/service.yml @@ -17,4 +17,7 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/nodejs/expected/service-instance-consumer-nodejs.yml b/test/e2e-v2/cases/nodejs/expected/service-instance-consumer-nodejs.yml index 8c23508597..972ff76ab0 100644 --- a/test/e2e-v2/cases/nodejs/expected/service-instance-consumer-nodejs.yml +++ b/test/e2e-v2/cases/nodejs/expected/service-instance-consumer-nodejs.yml @@ -29,4 +29,5 @@ {{- end}} language: UNKNOWN instanceuuid: {{ b64enc "consumer" }}.1_{{ b64enc "consumer-instance" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/nodejs/expected/service-instance-provider-nodejs.yml b/test/e2e-v2/cases/nodejs/expected/service-instance-provider-nodejs.yml index 196d1969d8..15622a6471 100644 --- a/test/e2e-v2/cases/nodejs/expected/service-instance-provider-nodejs.yml +++ b/test/e2e-v2/cases/nodejs/expected/service-instance-provider-nodejs.yml @@ -29,4 +29,5 @@ {{- end}} language: UNKNOWN instanceuuid: {{ b64enc "provider" }}.1_{{ b64enc "provider-instance" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/nodejs/expected/service.yml b/test/e2e-v2/cases/nodejs/expected/service.yml index 68428b13e3..896a6b81d0 100644 --- a/test/e2e-v2/cases/nodejs/expected/service.yml +++ b/test/e2e-v2/cases/nodejs/expected/service.yml @@ -17,10 +17,19 @@ - id: {{ b64enc "consumer" }}.1 name: consumer group: "" + shortname: consumer + layers: + - GENERAL - id: {{ b64enc "provider" }}.1 name: provider group: "" + shortname: provider + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/php/e2e.yaml b/test/e2e-v2/cases/php/e2e.yaml index 463909ba24..adf1004c9d 100644 --- a/test/e2e-v2/cases/php/e2e.yaml +++ b/test/e2e-v2/cases/php/e2e.yaml @@ -41,8 +41,11 @@ verify: # the interval between two retries, in millisecond. interval: 3s cases: + # layer list + - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql layer ls + expected: expected/layer.yml # service list - - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls + - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer GENERAL expected: expected/service.yml # service instance list - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql instance list --service-name=php diff --git a/test/e2e-v2/cases/php/expected/layer.yml b/test/e2e-v2/cases/php/expected/layer.yml new file mode 100644 index 0000000000..fc77de897f --- /dev/null +++ b/test/e2e-v2/cases/php/expected/layer.yml @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- contains . }} +- GENERAL +- VIRTUAL_DATABASE +{{- end }} diff --git a/test/e2e-v2/cases/php/expected/service-instance-php.yml b/test/e2e-v2/cases/php/expected/service-instance-php.yml index 52a1343dc1..b66e9c253d 100644 --- a/test/e2e-v2/cases/php/expected/service-instance-php.yml +++ b/test/e2e-v2/cases/php/expected/service-instance-php.yml @@ -31,4 +31,5 @@ {{- end}} language: PHP instanceuuid: {{ b64enc "php" }}.1_{{ b64enc "php-instance" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/php/expected/service-instance-provider.yml b/test/e2e-v2/cases/php/expected/service-instance-provider.yml index f9296e43bb..d862e0c3a0 100644 --- a/test/e2e-v2/cases/php/expected/service-instance-provider.yml +++ b/test/e2e-v2/cases/php/expected/service-instance-provider.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} -{{- end}} \ No newline at end of file + layer: GENERAL +{{- end}} diff --git a/test/e2e-v2/cases/php/expected/service.yml b/test/e2e-v2/cases/php/expected/service.yml index 61d110df36..0bdbfebafd 100644 --- a/test/e2e-v2/cases/php/expected/service.yml +++ b/test/e2e-v2/cases/php/expected/service.yml @@ -17,7 +17,13 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL - id: {{ b64enc "php" }}.1 name: php group: "" + shortname: php + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/profile/expected/service-instance.yml b/test/e2e-v2/cases/profile/expected/service-instance.yml index e5252050a3..d862e0c3a0 100644 --- a/test/e2e-v2/cases/profile/expected/service-instance.yml +++ b/test/e2e-v2/cases/profile/expected/service-instance.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/profile/expected/service.yml b/test/e2e-v2/cases/profile/expected/service.yml index 3a333487d9..5c4be35cec 100644 --- a/test/e2e-v2/cases/profile/expected/service.yml +++ b/test/e2e-v2/cases/profile/expected/service.yml @@ -17,4 +17,7 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/python/expected/service-instance-consumer-java.yml b/test/e2e-v2/cases/python/expected/service-instance-consumer-java.yml index 7d1d199a7a..9b5f754f54 100644 --- a/test/e2e-v2/cases/python/expected/service-instance-consumer-java.yml +++ b/test/e2e-v2/cases/python/expected/service-instance-consumer-java.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/python/expected/service-instance-consumer-py.yml b/test/e2e-v2/cases/python/expected/service-instance-consumer-py.yml index 937a69a1eb..4db26d18a5 100644 --- a/test/e2e-v2/cases/python/expected/service-instance-consumer-py.yml +++ b/test/e2e-v2/cases/python/expected/service-instance-consumer-py.yml @@ -25,4 +25,5 @@ {{- end}} language: UNKNOWN instanceuuid: {{ b64enc "consumer-py" }}.1_{{ b64enc "consumer-py-instance" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/python/expected/service-instance-provider-py-kafka.yml b/test/e2e-v2/cases/python/expected/service-instance-provider-py-kafka.yml index ee7870cefa..a62d85ccc2 100644 --- a/test/e2e-v2/cases/python/expected/service-instance-provider-py-kafka.yml +++ b/test/e2e-v2/cases/python/expected/service-instance-provider-py-kafka.yml @@ -25,4 +25,5 @@ {{- end}} language: UNKNOWN instanceuuid: {{ b64enc "provider-py-kafka" }}.1_{{ b64enc "provider-py-kafka-instance" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/python/expected/service-instance-provider-py.yml b/test/e2e-v2/cases/python/expected/service-instance-provider-py.yml index 53c2518d6d..0c2ce9d0a1 100644 --- a/test/e2e-v2/cases/python/expected/service-instance-provider-py.yml +++ b/test/e2e-v2/cases/python/expected/service-instance-provider-py.yml @@ -25,4 +25,5 @@ {{- end}} language: UNKNOWN instanceuuid: {{ b64enc "provider-py" }}.1_{{ b64enc "provider-py-instance" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/python/expected/service.yml b/test/e2e-v2/cases/python/expected/service.yml index 23c736dacd..24caf169e6 100644 --- a/test/e2e-v2/cases/python/expected/service.yml +++ b/test/e2e-v2/cases/python/expected/service.yml @@ -17,13 +17,25 @@ - id: {{ b64enc "provider-py" }}.1 name: provider-py group: "" + shortname: provider-py + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL - id: {{ b64enc "consumer-py" }}.1 name: consumer-py group: "" + shortname: consumer-py + layers: + - GENERAL - id: {{ b64enc "provider-py-kafka" }}.1 name: provider-py-kafka group: "" + shortname: provider-py-kafka + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/satellite/native-protocols/expected/service-instance.yml b/test/e2e-v2/cases/satellite/native-protocols/expected/service-instance.yml index 5f03bc18e7..0ec1a99e2e 100644 --- a/test/e2e-v2/cases/satellite/native-protocols/expected/service-instance.yml +++ b/test/e2e-v2/cases/satellite/native-protocols/expected/service-instance.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/satellite/native-protocols/expected/service.yml b/test/e2e-v2/cases/satellite/native-protocols/expected/service.yml index 20e26bcb0b..d3acfc1e9c 100644 --- a/test/e2e-v2/cases/satellite/native-protocols/expected/service.yml +++ b/test/e2e-v2/cases/satellite/native-protocols/expected/service.yml @@ -17,7 +17,13 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/simple/expected/layer.yml b/test/e2e-v2/cases/simple/expected/layer.yml new file mode 100644 index 0000000000..fc77de897f --- /dev/null +++ b/test/e2e-v2/cases/simple/expected/layer.yml @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- contains . }} +- GENERAL +- VIRTUAL_DATABASE +{{- end }} diff --git a/test/e2e-v2/cases/simple/expected/service-instance-consumer.yml b/test/e2e-v2/cases/simple/expected/service-instance-consumer.yml index 7d1d199a7a..9b5f754f54 100644 --- a/test/e2e-v2/cases/simple/expected/service-instance-consumer.yml +++ b/test/e2e-v2/cases/simple/expected/service-instance-consumer.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/simple/expected/service-instance-provider.yml b/test/e2e-v2/cases/simple/expected/service-instance-provider.yml index f9296e43bb..d862e0c3a0 100644 --- a/test/e2e-v2/cases/simple/expected/service-instance-provider.yml +++ b/test/e2e-v2/cases/simple/expected/service-instance-provider.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} -{{- end}} \ No newline at end of file + layer: GENERAL +{{- end}} diff --git a/test/e2e-v2/cases/simple/expected/service.yml b/test/e2e-v2/cases/simple/expected/service.yml index 20e26bcb0b..eebc8d2b26 100644 --- a/test/e2e-v2/cases/simple/expected/service.yml +++ b/test/e2e-v2/cases/simple/expected/service.yml @@ -17,7 +17,19 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL +- id: {{ b64enc "localhost:-1" }}.0 + name: localhost:-1 + group: "" + shortname: localhost:-1 + layers: + - VIRTUAL_DATABASE {{- end }} diff --git a/test/e2e-v2/cases/simple/simple-cases.yaml b/test/e2e-v2/cases/simple/simple-cases.yaml index f6549c1459..fe27cc9dc6 100644 --- a/test/e2e-v2/cases/simple/simple-cases.yaml +++ b/test/e2e-v2/cases/simple/simple-cases.yaml @@ -14,6 +14,9 @@ # limitations under the License. cases: + # layer list + - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql layer ls + expected: expected/layer.yml # service list - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls expected: expected/service.yml diff --git a/test/e2e-v2/cases/so11y/expected/layer.yml b/test/e2e-v2/cases/so11y/expected/layer.yml new file mode 100644 index 0000000000..ec21ec5386 --- /dev/null +++ b/test/e2e-v2/cases/so11y/expected/layer.yml @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- contains . }} +- GENERAL +- VIRTUAL_DATABASE +- SO11Y_OAP +{{- end }} diff --git a/test/e2e-v2/cases/so11y/expected/satellite-service.yml b/test/e2e-v2/cases/so11y/expected/satellite-service.yml index 13cf8cd67c..80267712de 100644 --- a/test/e2e-v2/cases/so11y/expected/satellite-service.yml +++ b/test/e2e-v2/cases/so11y/expected/satellite-service.yml @@ -16,5 +16,8 @@ {{- contains . }} - id: {{ b64enc "satellite::satellite-service" }}.1 name: satellite::satellite-service - group: "" -{{- end }} \ No newline at end of file + group: satellite + shortname: satellite-service + layers: + - SO11Y_SATELLITE +{{- end }} diff --git a/test/e2e-v2/cases/so11y/expected/service-instance.yml b/test/e2e-v2/cases/so11y/expected/service-instance.yml index 4c1ff1b876..f63e80cd38 100644 --- a/test/e2e-v2/cases/so11y/expected/service-instance.yml +++ b/test/e2e-v2/cases/so11y/expected/service-instance.yml @@ -21,4 +21,5 @@ attributes: [] language: UNKNOWN instanceuuid: {{ b64enc "oap::oap-server" }}.1_{{ b64enc "http://localhost:1234" }} -{{- end}} \ No newline at end of file + layer: SO11Y_OAP +{{- end}} diff --git a/test/e2e-v2/cases/so11y/expected/service.yml b/test/e2e-v2/cases/so11y/expected/service.yml index b1ec136a9b..3376dd58a8 100644 --- a/test/e2e-v2/cases/so11y/expected/service.yml +++ b/test/e2e-v2/cases/so11y/expected/service.yml @@ -17,10 +17,25 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL +- id: {{ b64enc "localhost:-1" }}.0 + name: localhost:-1 + group: "" + shortname: localhost:-1 + layers: + - VIRTUAL_DATABASE - id: {{ b64enc "oap::oap-server" }}.1 name: oap::oap-server - group: "" -{{- end }} \ No newline at end of file + group: oap + shortname: oap-server + layers: + - SO11Y_OAP +{{- end }} diff --git a/test/e2e-v2/cases/so11y/satellite-cases.yaml b/test/e2e-v2/cases/so11y/satellite-cases.yaml index 9bbeffb7fd..25562bdcb7 100644 --- a/test/e2e-v2/cases/so11y/satellite-cases.yaml +++ b/test/e2e-v2/cases/so11y/satellite-cases.yaml @@ -15,10 +15,10 @@ cases: # service list - - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls + - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer SO11Y_SATELLITE expected: expected/satellite-service.yml # service metrics - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name=satellite_service_server_cpu_utilization --service-name=satellite::satellite-service |yq e 'to_entries' - expected: expected/metrics-has-value.yml - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name=satellite_service_grpc_connect_count --service-name=satellite::satellite-service |yq e 'to_entries' - - expected: expected/metrics-has-value.yml \ No newline at end of file + expected: expected/metrics-has-value.yml diff --git a/test/e2e-v2/cases/so11y/so11y-cases.yaml b/test/e2e-v2/cases/so11y/so11y-cases.yaml index 3e2276a78e..3899035e79 100644 --- a/test/e2e-v2/cases/so11y/so11y-cases.yaml +++ b/test/e2e-v2/cases/so11y/so11y-cases.yaml @@ -14,6 +14,9 @@ # limitations under the License. cases: + # layer list + - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql layer ls + expected: expected/layer.yml # service list - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls expected: expected/service.yml diff --git a/test/e2e-v2/cases/storage/expected/layer.yml b/test/e2e-v2/cases/storage/expected/layer.yml new file mode 100644 index 0000000000..fc77de897f --- /dev/null +++ b/test/e2e-v2/cases/storage/expected/layer.yml @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- contains . }} +- GENERAL +- VIRTUAL_DATABASE +{{- end }} diff --git a/test/e2e-v2/cases/storage/expected/service-instance.yml b/test/e2e-v2/cases/storage/expected/service-instance.yml index 5f03bc18e7..0ec1a99e2e 100644 --- a/test/e2e-v2/cases/storage/expected/service-instance.yml +++ b/test/e2e-v2/cases/storage/expected/service-instance.yml @@ -37,4 +37,5 @@ {{- end}} language: JAVA instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }} + layer: GENERAL {{- end}} diff --git a/test/e2e-v2/cases/storage/expected/service.yml b/test/e2e-v2/cases/storage/expected/service.yml index 20e26bcb0b..d3acfc1e9c 100644 --- a/test/e2e-v2/cases/storage/expected/service.yml +++ b/test/e2e-v2/cases/storage/expected/service.yml @@ -17,7 +17,13 @@ - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + layers: + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer group: "" + shortname: e2e-service-consumer + layers: + - GENERAL {{- end }} diff --git a/test/e2e-v2/cases/storage/storage-cases.yaml b/test/e2e-v2/cases/storage/storage-cases.yaml index 83bafddece..792ba74d90 100644 --- a/test/e2e-v2/cases/storage/storage-cases.yaml +++ b/test/e2e-v2/cases/storage/storage-cases.yaml @@ -14,8 +14,11 @@ # limitations under the License. cases: + # layer list + - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql layer ls + expected: expected/layer.yml # service list - - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls + - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer GENERAL expected: expected/service.yml # service metrics - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name service_sla --service-name=e2e-service-provider | yq e 'to_entries' - diff --git a/test/e2e-v2/cases/vm/expected/service.yml b/test/e2e-v2/cases/vm/expected/service.yml index 84e8128ba7..8e56a0c428 100644 --- a/test/e2e-v2/cases/vm/expected/service.yml +++ b/test/e2e-v2/cases/vm/expected/service.yml @@ -16,5 +16,8 @@ {{- contains . }} - id: {{ b64enc "vm::vm-service" }}.1 name: vm::vm-service - group: "" + shortname: vm-service + group: vm + layers: + - OS_LINUX {{- end }} diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env index e3c2aee459..45c3967864 100644 --- a/test/e2e-v2/script/env +++ b/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=45a5f9807126dc6ea9fe06e17e7aafbe212436d2 +SW_CTL_COMMIT=3278a47ab49e672f4ef7eb2ab5c806faf3c48dd5 diff --git a/test/e2e-v2/script/prepare/setup-e2e-shell/install-swctl.sh b/test/e2e-v2/script/prepare/setup-e2e-shell/install-swctl.sh index 58932521c3..c58fde4fe3 100644 --- a/test/e2e-v2/script/prepare/setup-e2e-shell/install-swctl.sh +++ b/test/e2e-v2/script/prepare/setup-e2e-shell/install-swctl.sh @@ -27,5 +27,5 @@ if ! command -v swctl &> /dev/null; then curl -kLo skywalking-cli.tar.gz https://github.com/apache/skywalking-cli/archive/${SW_CTL_COMMIT}.tar.gz tar -zxf skywalking-cli.tar.gz --strip=1 utype=$(uname | awk '{print tolower($0)}') - make $utype && mv bin/swctl-*-$utype-amd64 $BIN_DIR/swctl -fi \ No newline at end of file + make $utype-amd64 && mv bin/swctl-*-$utype-amd64 $BIN_DIR/swctl +fi