This is an automated email from the ASF dual-hosted git repository.
oscerd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new d716a9d3c Fix #2873: migrate the remaining itests from Pipe to Camel
routes (#3045)
d716a9d3c is described below
commit d716a9d3c7b443dbf658e8d9230e85040f657b03
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Sep 17 11:53:10 2026 +0200
Fix #2873: migrate the remaining itests from Pipe to Camel routes (#3045)
Final tranche, the twelve single Pipes left after #3040, #3041 and #3044:
counter, crypto, earthquake, the two filters, header, the two http ones,
log,
mail, openapi and timer.
Three did not fit the rename used so far.
earthquake-to-http.yaml and http-source-to-http.yaml carry no -pipe in their
names, and neither do their Citrus files or test names, so only the contents
change; renaming them to -route would churn three names to say what the file
already says.
openapi has one Pipe driven by two Citrus tests named after their scenario
rather than after the Pipe, so the integration file is renamed and the
references in both tests follow, while the Citrus file names and test names
stay
as they are.
After this every Pipe that a Citrus test references has been migrated. The
five
that remain are the ones that cannot be: salesforce's three and the two
Knative
ones under aws/s3, all driven by .feature files whose Camel K steps take
Pipe
resources.
Verified with a clean run of CommonIT, MailIT and OpenApiIT:
TOTAL: 37 PASSED: 37 (100.0%)
which covers every Kamelet migrated here and re-confirms the transformation
ones
from #3040.
Co-authored-by: Claude Opus 5 <[email protected]>
---
...it.yaml => counter-source-route.citrus.it.yaml} | 6 +--
.../counter-source-route.yaml} | 28 ++++++-------
.../test/resources/crypto/crypto-action-pipe.yaml | 49 ----------------------
....it.yaml => crypto-action-route.citrus.it.yaml} | 4 +-
.../crypto-action-route.yaml} | 44 ++++++++++---------
.../resources/earthquake/earthquake-to-http.yaml | 18 +++-----
.../filter/has-header-filter-action-pipe.yaml | 46 --------------------
... has-header-filter-action-route.citrus.it.yaml} | 4 +-
.../has-header-filter-action-route.yaml} | 34 ++++++++-------
...> predicate-filter-action-route.citrus.it.yaml} | 4 +-
.../predicate-filter-action-route.yaml} | 35 +++++++---------
...l => insert-header-action-route.citrus.it.yaml} | 4 +-
.../insert-header-action-route.yaml} | 29 +++++++------
...trus.it.yaml => http-sink-route.citrus.it.yaml} | 4 +-
.../http-sink-route.yaml} | 24 +++++------
.../test/resources/http/http-source-to-http.yaml | 26 +++++-------
.../src/test/resources/log/log-sink-pipe.yaml | 38 -----------------
...itrus.it.yaml => log-sink-route.citrus.it.yaml} | 6 +--
.../log-sink-route.yaml} | 24 +++++------
.../src/test/resources/mail/mail-sink-pipe.yaml | 47 ---------------------
...trus.it.yaml => mail-sink-route.citrus.it.yaml} | 4 +-
.../mail-sink-route.yaml} | 40 ++++++++----------
.../rest-openapi-sink-add-pet.citrus.it.yaml | 2 +-
.../rest-openapi-sink-delete-pet.citrus.it.yaml | 2 +-
.../resources/openapi/rest-openapi-sink-pipe.yaml | 46 --------------------
.../rest-openapi-sink-route.yaml} | 39 ++++++++---------
....it.yaml => timer-to-http-route.citrus.it.yaml} | 4 +-
.../timer-to-http-route.yaml} | 21 ++++------
28 files changed, 185 insertions(+), 447 deletions(-)
diff --git
a/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-route.citrus.it.yaml
similarity index 90%
copy from
tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml
copy to
tests/camel-kamelets-itest/src/test/resources/counter/counter-source-route.citrus.it.yaml
index 8edfda446..b8e2d53f9 100644
---
a/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: counter-source-pipe-test
+name: counter-source-route-test
actions:
# Run the counter-source -> log-sink Pipe via Camel JBang
- camel:
@@ -23,11 +23,11 @@ actions:
run:
waitForRunningState: false
integration:
- file: "counter/counter-source-pipe.yaml"
+ file: "counter/counter-source-route.yaml"
# Verify the generated sequential number reaches the log sink
- camel:
cli:
verify:
- integration: "counter-source-pipe"
+ integration: "counter-source-route"
logMessage: "777777"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-route.yaml
similarity index 75%
copy from
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.yaml
copy to
tests/camel-kamelets-itest/src/test/resources/counter/counter-source-route.yaml
index a8ba3c74a..258264a98 100644
---
a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-route.yaml
@@ -15,18 +15,16 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: timer-to-http-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- message: "{{timer.message}}"
- sink:
- uri: "{{http.sink.url}}/events"
+- route:
+ from:
+ uri: "kamelet:counter-source"
+ parameters:
+ period: 1000
+ start: 777777
+ numbers: 1
+ steps:
+ - to:
+ uri: "kamelet:log-sink"
+ parameters:
+ loggerName: test-counter-source
+ showHeaders: false
diff --git
a/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.yaml
deleted file mode 100644
index b0de0ea29..000000000
---
a/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# ---------------------------------------------------------------------------
-# 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.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: crypto-action-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- contentType: text/plain
- message: >
- {{input}}
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: crypto-encrypt-action
- properties:
- algorithm: "{{crypto.algorithm}}"
- key: "{{crypto.key}}"
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: crypto-decrypt-action
- properties:
- algorithm: "{{crypto.algorithm}}"
- key: "{{crypto.key}}"
- sink:
- uri: "{{http.sink.url}}/result"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-route.citrus.it.yaml
similarity index 96%
rename from
tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-route.citrus.it.yaml
index 86acf71a2..ec540cdcc 100644
---
a/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: crypto-action-pipe-test
+name: crypto-action-route-test
variables:
- name: "crypto.algorithm"
value: "AES"
@@ -34,7 +34,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "crypto/crypto-action-pipe.yaml"
+ file: "crypto/crypto-action-route.yaml"
systemProperties:
properties:
- name: "http.sink.url"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-route.yaml
similarity index 61%
rename from
tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-route.yaml
index 52c38ff6a..bef9bb253 100644
---
a/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-route.yaml
@@ -15,26 +15,24 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: predicate-filter-action-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- contentType: application/json
- message: "{{input}}"
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: predicate-filter-action
- properties:
- expression: "{{filter.expression}}"
- sink:
- uri: "{{http.sink.url}}/result"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ contentType: text/plain
+ message: >
+ {{input}}
+ steps:
+ - to:
+ uri: "kamelet:crypto-encrypt-action"
+ parameters:
+ algorithm: '{{crypto.algorithm}}'
+ key: '{{crypto.key}}'
+ - to:
+ uri: "kamelet:crypto-decrypt-action"
+ parameters:
+ algorithm: '{{crypto.algorithm}}'
+ key: '{{crypto.key}}'
+ - to:
+ uri: "{{http.sink.url}}/result"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
b/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
index 06a1dc00d..cedf24536 100644
---
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
@@ -15,15 +15,9 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: earthquake-to-http
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: earthquake-source
- sink:
- uri: "{{http.sink.url}}"
+- route:
+ from:
+ uri: "kamelet:earthquake-source"
+ steps:
+ - to:
+ uri: "{{http.sink.url}}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.yaml
deleted file mode 100644
index 4a432399d..000000000
---
a/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# ---------------------------------------------------------------------------
-# 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.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: has-header-filter-action-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- message: "{{input}}"
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: insert-header-action
- properties:
- name: "{{header.name}}"
- value: "{{header.value}}"
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: has-header-filter-action
- properties:
- name: "{{header.name}}"
- sink:
- uri: "{{http.sink.url}}/result"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-route.citrus.it.yaml
similarity index 95%
rename from
tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-route.citrus.it.yaml
index 09d78faaf..7c0afe51a 100644
---
a/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: has-header-filter-action-pipe-test
+name: has-header-filter-action-route-test
variables:
- name: "id"
value: "citrus:randomUUID()"
@@ -34,7 +34,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "filter/has-header-filter-action-pipe.yaml"
+ file: "filter/has-header-filter-action-route.yaml"
systemProperties:
properties:
- name: "http.sink.url"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-route.yaml
similarity index 65%
rename from
tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-route.yaml
index 8edfda446..942c16842 100644
---
a/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-route.yaml
@@ -15,19 +15,21 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: counter-source-pipe-test
-actions:
- # Run the counter-source -> log-sink Pipe via Camel JBang
- - camel:
- cli:
- run:
- waitForRunningState: false
- integration:
- file: "counter/counter-source-pipe.yaml"
-
- # Verify the generated sequential number reaches the log sink
- - camel:
- cli:
- verify:
- integration: "counter-source-pipe"
- logMessage: "777777"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ message: '{{input}}'
+ steps:
+ - to:
+ uri: "kamelet:insert-header-action"
+ parameters:
+ name: '{{header.name}}'
+ value: '{{header.value}}'
+ - to:
+ uri: "kamelet:has-header-filter-action"
+ parameters:
+ name: '{{header.name}}'
+ - to:
+ uri: "{{http.sink.url}}/result"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-route.citrus.it.yaml
similarity index 95%
rename from
tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-route.citrus.it.yaml
index df779ac3c..d397736bb 100644
---
a/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: predicate-filter-action-pipe-test
+name: predicate-filter-action-route-test
variables:
- name: "name.value"
value: "Camel"
@@ -30,7 +30,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "filter/predicate-filter-action-pipe.yaml"
+ file: "filter/predicate-filter-action-route.yaml"
systemProperties:
properties:
- name: "http.sink.url"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-route.yaml
similarity index 69%
rename from
tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-route.yaml
index e3bd348df..0a2982e5f 100644
--- a/tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-route.yaml
@@ -15,24 +15,17 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: http-sink-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- message: "{{input}}"
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: http-sink
- properties:
- url: "{{http.sink.url}}/result"
- method: "POST"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ contentType: application/json
+ message: '{{input}}'
+ steps:
+ - to:
+ uri: "kamelet:predicate-filter-action"
+ parameters:
+ expression: '{{filter.expression}}'
+ - to:
+ uri: "{{http.sink.url}}/result"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-route.citrus.it.yaml
similarity index 95%
rename from
tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-route.citrus.it.yaml
index 7e4ef59f3..613dc31b5 100644
---
a/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: insert-header-action-pipe-test
+name: insert-header-action-route-test
variables:
- name: "id"
value: "citrus:randomUUID()"
@@ -34,7 +34,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "header/insert-header-action-pipe.yaml"
+ file: "header/insert-header-action-route.yaml"
systemProperties:
properties:
- name: "http.sink.url"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-route.yaml
similarity index 72%
rename from
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-route.yaml
index a8ba3c74a..ab2fd67f7 100644
---
a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-route.yaml
@@ -15,18 +15,17 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: timer-to-http-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- message: "{{timer.message}}"
- sink:
- uri: "{{http.sink.url}}/events"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ message: '{{input}}'
+ steps:
+ - to:
+ uri: "kamelet:insert-header-action"
+ parameters:
+ name: '{{header.name}}'
+ value: '{{header.value}}'
+ - to:
+ uri: "{{http.sink.url}}/result"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/http/http-sink-route.citrus.it.yaml
similarity index 96%
rename from
tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/http/http-sink-route.citrus.it.yaml
index aeb5f64f8..87fa17634 100644
---
a/tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/http/http-sink-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: http-sink-pipe-test
+name: http-sink-route-test
variables:
- name: "id"
value: "citrus:randomUUID()"
@@ -30,7 +30,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "http/http-sink-pipe.yaml"
+ file: "http/http-sink-route.yaml"
systemProperties:
properties:
- name: "http.sink.url"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
b/tests/camel-kamelets-itest/src/test/resources/http/http-sink-route.yaml
similarity index 76%
copy from
tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
copy to tests/camel-kamelets-itest/src/test/resources/http/http-sink-route.yaml
index 06a1dc00d..a01e4e4df 100644
---
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/http/http-sink-route.yaml
@@ -15,15 +15,15 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: earthquake-to-http
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: earthquake-source
- sink:
- uri: "{{http.sink.url}}"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ message: '{{input}}'
+ steps:
+ - to:
+ uri: "kamelet:http-sink"
+ parameters:
+ url: '{{http.sink.url}}/result'
+ method: POST
diff --git
a/tests/camel-kamelets-itest/src/test/resources/http/http-source-to-http.yaml
b/tests/camel-kamelets-itest/src/test/resources/http/http-source-to-http.yaml
index 22c984459..8d9c0b2fe 100644
---
a/tests/camel-kamelets-itest/src/test/resources/http/http-source-to-http.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/http/http-source-to-http.yaml
@@ -15,19 +15,13 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: http-source-to-http
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: http-source
- properties:
- url: "{{http.source.url}}/data"
- period: 10000
- contentType: application/json
- sink:
- uri: "{{http.sink.url}}/result"
+- route:
+ from:
+ uri: "kamelet:http-source"
+ parameters:
+ url: '{{http.source.url}}/data'
+ period: 10000
+ contentType: application/json
+ steps:
+ - to:
+ uri: "{{http.sink.url}}/result"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.yaml
deleted file mode 100644
index 8dd027b95..000000000
--- a/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-# ---------------------------------------------------------------------------
-# 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.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: log-sink-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- message: "{{message}}"
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: log-sink
- properties:
- loggerName: "test-log-sink"
- showHeaders: false
diff --git
a/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/log/log-sink-route.citrus.it.yaml
similarity index 92%
rename from
tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/log/log-sink-route.citrus.it.yaml
index 0c0cf0c51..80c5c78ab 100644
---
a/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/log/log-sink-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: log-sink-pipe-test
+name: log-sink-route-test
variables:
- name: "log.message"
value: "Hello from log-sink test!"
@@ -26,7 +26,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "log/log-sink-pipe.yaml"
+ file: "log/log-sink-route.yaml"
systemProperties:
properties:
- name: "message"
@@ -36,5 +36,5 @@ actions:
- camel:
cli:
verify:
- integration: "log-sink-pipe"
+ integration: "log-sink-route"
logMessage: "${log.message}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
b/tests/camel-kamelets-itest/src/test/resources/log/log-sink-route.yaml
similarity index 76%
copy from
tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
copy to tests/camel-kamelets-itest/src/test/resources/log/log-sink-route.yaml
index 06a1dc00d..07b1eab44 100644
---
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/log/log-sink-route.yaml
@@ -15,15 +15,15 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: earthquake-to-http
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: earthquake-source
- sink:
- uri: "{{http.sink.url}}"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ message: '{{message}}'
+ steps:
+ - to:
+ uri: "kamelet:log-sink"
+ parameters:
+ loggerName: test-log-sink
+ showHeaders: false
diff --git
a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.yaml
deleted file mode 100644
index baba0f504..000000000
--- a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# ---------------------------------------------------------------------------
-# 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.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: timer-to-mail
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- message: "{{mail.message}}"
- sink:
- ref:
- apiVersion: camel.apache.org/v1
- kind: Kamelet
- name: mail-sink
- properties:
- # The Citrus mail server this test starts is a plaintext SMTP server, so
- # the protocol has to be pinned. mail-sink defaults to smtps (implicit
- # TLS) since #2956, which is the right default for real deployments but
- # cannot complete a handshake against the mock.
- protocol: "smtp"
- connectionHost: "{{mail.host}}"
- connectionPort: "{{mail.port}}"
- username: "{{mail.username}}"
- password: "{{mail.password}}"
- from: "{{mail.from}}"
- to: "{{mail.to}}"
- subject: "{{mail.subject}}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-route.citrus.it.yaml
similarity index 96%
rename from
tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-route.citrus.it.yaml
index 9ee12e74c..8fb83f688 100644
---
a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: mail-sink-pipe-test
+name: mail-sink-route-test
variables:
- name: "mail.host"
value: "localhost"
@@ -44,7 +44,7 @@ actions:
cli:
run:
integration:
- file: "mail/mail-sink-pipe.yaml"
+ file: "mail/mail-sink-route.yaml"
systemProperties:
file: "mail/application.properties"
properties:
diff --git
a/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-route.yaml
similarity index 64%
rename from
tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-route.yaml
index 7805bc999..9f7903508 100644
---
a/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-route.yaml
@@ -15,26 +15,20 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: insert-header-action-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- message: "{{input}}"
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: insert-header-action
- properties:
- name: "{{header.name}}"
- value: "{{header.value}}"
- sink:
- uri: "{{http.sink.url}}/result"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ message: '{{mail.message}}'
+ steps:
+ - to:
+ uri: "kamelet:mail-sink"
+ parameters:
+ protocol: smtp
+ connectionHost: '{{mail.host}}'
+ connectionPort: '{{mail.port}}'
+ username: '{{mail.username}}'
+ password: '{{mail.password}}'
+ from: '{{mail.from}}'
+ to: '{{mail.to}}'
+ subject: '{{mail.subject}}'
diff --git
a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml
index 45779231b..c0ec5ed61 100644
---
a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml
@@ -32,7 +32,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "openapi/rest-openapi-sink-pipe.yaml"
+ file: "openapi/rest-openapi-sink-route.yaml"
systemProperties:
properties:
- name: "petstore.server.url"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml
index c6f48870e..d4ab3ea6c 100644
---
a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml
@@ -32,7 +32,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "openapi/rest-openapi-sink-pipe.yaml"
+ file: "openapi/rest-openapi-sink-route.yaml"
systemProperties:
properties:
- name: "petstore.server.url"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-pipe.yaml
deleted file mode 100644
index 89fa21b86..000000000
---
a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-pipe.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# ---------------------------------------------------------------------------
-# 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.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: rest-openapi-sink-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- message: "{{pet}}"
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: insert-header-action
- properties:
- name: petId
- value: "{{petId}}"
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: rest-openapi-sink
- properties:
- specification: "{{petstore.server.url}}/petstore/openapi.json"
- operation: "{{spec.operation}}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-route.yaml
similarity index 65%
rename from
tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-route.yaml
index 8a6c1c98c..5834c1b90 100644
---
a/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-route.yaml
@@ -15,25 +15,20 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: counter-source-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: counter-source
- properties:
- period: 1000
- start: 777777
- numbers: 1
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: log-sink
- properties:
- loggerName: "test-counter-source"
- showHeaders: false
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ message: '{{pet}}'
+ steps:
+ - to:
+ uri: "kamelet:insert-header-action"
+ parameters:
+ name: petId
+ value: '{{petId}}'
+ - to:
+ uri: "kamelet:rest-openapi-sink"
+ parameters:
+ specification: '{{petstore.server.url}}/petstore/openapi.json'
+ operation: '{{spec.operation}}'
diff --git
a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-route.citrus.it.yaml
similarity index 95%
rename from
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-route.citrus.it.yaml
index b34474a85..51905a57b 100644
---
a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: timer-to-http-pipe-test
+name: timer-to-http-route-test
variables:
- name: "timer.message"
value: "Camel rocks!"
@@ -30,7 +30,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "timer/timer-to-http-pipe.yaml"
+ file: "timer/timer-to-http-route.yaml"
systemProperties:
properties:
- name: "http.sink.url"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-route.yaml
similarity index 80%
copy from
tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
copy to
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-route.yaml
index 06a1dc00d..546b7fd41 100644
---
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-route.yaml
@@ -15,15 +15,12 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: earthquake-to-http
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: earthquake-source
- sink:
- uri: "{{http.sink.url}}"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ message: '{{timer.message}}'
+ steps:
+ - to:
+ uri: "{{http.sink.url}}/events"
