-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[V1] external container itests (#387)
* External container integration tests (#376) * Update instructions for manual itest rerun * Set up test container inside a pod * Add basic external container discovery test Add test and utils to run an external container within the test pod, check that ContainerJFR discovers it, and then tear down * Move utility classes into util package * Mark test as disabled rather than commented out * Rename base class * Set pod name as property rather than hard-coded * Refactoring * Correct BasicCommandChannelIT expected hostnames
- Loading branch information
1 parent
3050fbb
commit e62cce5
Showing
14 changed files
with
352 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /*- | ||
| * #%L | ||
| * Container JFR | ||
| * %% | ||
| * Copyright (C) 2020 Red Hat, Inc. | ||
| * %% | ||
| * The Universal Permissive License (UPL), Version 1.0 | ||
| * | ||
| * Subject to the condition set forth below, permission is hereby granted to any | ||
| * person obtaining a copy of this software, associated documentation and/or data | ||
| * (collectively the "Software"), free of charge and under any and all copyright | ||
| * rights in the Software, and any and all patent rights owned or freely | ||
| * licensable by each licensor hereunder covering either (i) the unmodified | ||
| * Software as contributed to or provided by such licensor, or (ii) the Larger | ||
| * Works (as defined below), to deal in both | ||
| * | ||
| * (a) the Software, and | ||
| * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if | ||
| * one is included with the Software (each a "Larger Work" to which the Software | ||
| * is contributed by such licensors), | ||
| * | ||
| * without restriction, including without limitation the rights to copy, create | ||
| * derivative works of, display, perform, and distribute the Software and make, | ||
| * use, sell, offer for sale, import, export, have made, and have sold the | ||
| * Software and the Larger Work(s), and to sublicense the foregoing rights on | ||
| * either these or other terms. | ||
| * | ||
| * This license is subject to the following condition: | ||
| * The above copyright notice and either this complete permission notice or at | ||
| * a minimum a reference to the UPL must be included in all copies or | ||
| * substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| * #L% | ||
| */ | ||
| package itest; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.hamcrest.MatcherAssert; | ||
| import org.hamcrest.Matchers; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import io.vertx.core.json.JsonArray; | ||
| import itest.util.Podman; | ||
|
|
||
| class ConnectToExternalTargetsIT extends TestBase { | ||
|
|
||
| static final List<String> CONTAINERS = new ArrayList<>(); | ||
|
|
||
| @BeforeAll | ||
| static void setup() throws Exception { | ||
| Set<String> specs = Set.of("quay.io/andrewazores/vertx-fib-demo:0.3.0"); | ||
| for (String spec : specs) { | ||
| CONTAINERS.add(Podman.run(spec)); | ||
| } | ||
| for (String id : CONTAINERS) { | ||
| Podman.waitForContainerState(id, "running"); | ||
| } | ||
| Thread.sleep(7_500L); // wait for JDP to discover new containers | ||
| } | ||
|
|
||
| @AfterAll | ||
| static void cleanup() throws Exception { | ||
| for (String id : CONTAINERS) { | ||
| Podman.rm(id); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testOtherContainerFound() throws Exception { | ||
| CompletableFuture<JsonArray> resp = new CompletableFuture<>(); | ||
| webClient | ||
| .get("/api/v1/targets") | ||
| .send( | ||
| ar -> { | ||
| if (assertRequestStatus(ar, resp)) { | ||
| resp.complete(ar.result().bodyAsJsonArray()); | ||
| } | ||
| }); | ||
| JsonArray listResp = resp.get(REQUEST_TIMEOUT_SECONDS, TimeUnit.SECONDS); | ||
| Set<Map<String, String>> actual = new HashSet<>(listResp.getList()); | ||
| // ordering may not be guaranteed so use a Set, but there should be no duplicates and so | ||
| // size should not change | ||
| MatcherAssert.assertThat(actual.size(), Matchers.equalTo(listResp.size())); | ||
| Set<Map<String, String>> expected = | ||
| Set.of( | ||
| Map.of( | ||
| "connectUrl", | ||
| String.format( | ||
| "service:jmx:rmi:///jndi/rmi://%s:9091/jmxrmi", | ||
| Podman.POD_NAME), | ||
| "alias", | ||
| "com.redhat.rhjmc.containerjfr.ContainerJfr"), | ||
| Map.of( | ||
| "connectUrl", | ||
| String.format( | ||
| "service:jmx:rmi:///jndi/rmi://%s:9093/jmxrmi", | ||
| Podman.POD_NAME), | ||
| "alias", | ||
| "es.andrewazor.demo.Main")); | ||
| MatcherAssert.assertThat(actual, Matchers.equalTo(expected)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.