f) {
- return allItems.stream().filter(f).collect(Collectors.toList());
- }
-
- private void waitUntilAddressSpaceActive(AddressSpace addressSpace) throws Exception {
- String name = addressSpace.getMetadata().getName();
- resourcesManager.waitForAddressSpaceReady(addressSpace);
- Boolean active = Optional.ofNullable(selenium.waitUntilItemPresent(60, () -> consolePage.getAddressSpaceItem(addressSpace)))
- .map(webItem -> webItem.getStatus().contains("Active"))
- .orElseGet(() -> {
- log.error("AddressSpaceWebItem {} not present", name);
- return false;
- });
- assertTrue(active, String.format("Address space %s not marked active in UI within timeout", name));
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/bases/web/WebSocketBrowserTest.java b/systemtests/src/test/java/io/enmasse/systemtest/bases/web/WebSocketBrowserTest.java
deleted file mode 100644
index 88c88ba97e0..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/bases/web/WebSocketBrowserTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2018, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.bases.web;
-
-
-import io.enmasse.address.model.Address;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.shared.ITestBaseShared;
-import io.enmasse.systemtest.model.addressspace.AddressSpaceType;
-import io.enmasse.systemtest.selenium.SeleniumProvider;
-import io.enmasse.systemtest.selenium.page.RheaWebPage;
-import io.enmasse.systemtest.utils.AddressSpaceUtils;
-import org.junit.jupiter.api.BeforeEach;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public abstract class WebSocketBrowserTest extends TestBase implements ITestBaseShared {
-
- private RheaWebPage rheaWebPage;
-
- @BeforeEach
- public void setUpWebConsoleTests() throws Exception {
- rheaWebPage = new RheaWebPage(SeleniumProvider.getInstance());
- resourcesManager.deleteAddresses(getSharedAddressSpace());
- }
-
- //============================================================================================
- //============================ do test methods ===============================================
- //============================================================================================
-
- protected void doWebSocketSendReceive(Address destination) throws Exception {
- resourcesManager.setAddresses(destination);
- int count = 10;
-
- rheaWebPage.sendReceiveMessages(AddressSpaceUtils.getMessagingWssRoute(getSharedAddressSpace()).toString(), destination.getSpec().getAddress(),
- count, defaultCredentials, AddressSpaceType.valueOf(getSharedAddressSpace().getSpec().getType().toUpperCase()));
- assertTrue(rheaWebPage.checkCountMessage(count * 2), "Browser client didn't sent and received all messages");
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/resources/CliOutputDataTest.java b/systemtests/src/test/java/io/enmasse/systemtest/framework/CliOutputDataTest.java
similarity index 98%
rename from systemtests/src/test/java/io/enmasse/systemtest/resources/CliOutputDataTest.java
rename to systemtests/src/test/java/io/enmasse/systemtest/framework/CliOutputDataTest.java
index 8503b3c9191..0e031eb2df8 100644
--- a/systemtests/src/test/java/io/enmasse/systemtest/resources/CliOutputDataTest.java
+++ b/systemtests/src/test/java/io/enmasse/systemtest/framework/CliOutputDataTest.java
@@ -2,9 +2,10 @@
* Copyright 2020, EnMasse authors.
* License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
*/
-package io.enmasse.systemtest.resources;
+package io.enmasse.systemtest.framework;
import io.enmasse.systemtest.TestTag;
+import io.enmasse.systemtest.resources.CliOutputData;
import io.enmasse.systemtest.resources.CliOutputData.CliOutputDataType;
import org.junit.jupiter.api.Tag;
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/CredentialsTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/CredentialsTest.java
deleted file mode 100644
index c64c24b3348..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/CredentialsTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2019, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot;
-
-import io.enmasse.systemtest.TestTag;
-import io.vertx.core.json.JsonObject;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-@Tag(TestTag.FRAMEWORK)
-public class CredentialsTest {
-
- @Test
- void testCreateSecret() {
- var creds = JsonObject.mapFrom(CredentialsRegistryClient.createCredentialsObject("auth-id", "foo", null));
-
- var secrets = creds.getJsonArray("secrets");
- assertNotNull(secrets);
- var secret = secrets.getJsonObject(0);
- assertNotNull(secret);
-
- assertNotNull(secret.getBinary("pwd-hash"));
- assertNotNull(secret.getBinary("salt"));
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/DeviceCertificateManagerTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/DeviceCertificateManagerTest.java
deleted file mode 100644
index 8c52eb2f6b1..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/DeviceCertificateManagerTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot;
-
-import static io.enmasse.systemtest.TestTag.FRAMEWORK;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.security.cert.X509Certificate;
-import java.time.Duration;
-import java.time.Instant;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.systemtest.iot.DeviceCertificateManager.Device;
-import io.enmasse.systemtest.iot.DeviceCertificateManager.Mode;
-
-@Tag(FRAMEWORK)
-public class DeviceCertificateManagerTest {
-
- @Test
- public void testRsa() throws Exception {
- final DeviceCertificateManager mgr = new DeviceCertificateManager(Mode.RSA, new X500Principal("CN=foo,OU=bar,O=baz"));
-
- final X509Certificate cert = mgr.getCertificate();
- assertNotNull(cert);
-
- final Device device = mgr.createDevice("dev1", Instant.now(), Duration.ofDays(90));
- assertNotNull(device);
- assertNotNull(device.getKey());
- assertNotNull(device.getCertificate());
- }
-
- @Test
- public void testEc() throws Exception {
- final DeviceCertificateManager mgr = new DeviceCertificateManager(Mode.EC, new X500Principal("CN=foo,OU=bar,O=baz"));
-
- final X509Certificate cert = mgr.getCertificate();
- assertNotNull(cert);
-
- final Device device = mgr.createDevice("dev1", Instant.now(), Duration.ofDays(90));
- assertNotNull(device);
- assertNotNull(device.getKey());
- assertNotNull(device.getCertificate());
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/DeviceSupplier.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/DeviceSupplier.java
deleted file mode 100644
index 0b024785756..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/DeviceSupplier.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot;
-
-import java.util.Objects;
-
-import org.junit.jupiter.params.provider.MethodSource;
-
-import io.enmasse.systemtest.iot.IoTTestSession.Device;
-
-/**
- * A supplier for devices. Required due to an issue in Surefire.
- *
- * This is a workaround for SUREFIRE-1799, which silently drops unit tests in case
- * there is an exception being thrown in a method of a {@link MethodSource}. As we
- * create {@link Device}s for parametrized tests and creation of devices might fail,
- * that will be an issue.
- *
- * The idea is to delay the actual execution of the device creation until it
- * is running in the actual test case. So instead of creating devices, we create
- * code that creates devices. The call to the {@link #get()} method should perform
- * the actual device creation, and it may fail, which is reported as a test failure.
- *
- * @see SUREFIRE-1799
- */
-@FunctionalInterface
-public interface DeviceSupplier {
-
- public Device get() throws Exception;
-
- /**
- * Allows to override the output of the {@link #toString()} method.
- *
- * This may be used to provide a stable name for parameterized test.
- *
- * @implNote This was originally part of the {@link Device} class. Due to
- * SUREFIRE-1799 this code currently lives here.
- *
- * @param name The value to report from {@link #toString()}.
- * @return The new instance, reporting the provided name.
- */
- static DeviceSupplier named(final String name, final DeviceSupplier supplier) {
-
- Objects.requireNonNull(name);
- Objects.requireNonNull(supplier);
-
- return new DeviceSupplier() {
-
- @Override
- public Device get() throws Exception {
- return supplier.get();
- }
-
- @Override
- public String toString() {
- return name;
- }
- };
-
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/IoTTestSessionTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/IoTTestSessionTest.java
deleted file mode 100644
index f5b600013c1..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/IoTTestSessionTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot;
-
-import static io.enmasse.systemtest.TestTag.FRAMEWORK;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.HTTP;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.iot.model.v1.IoTConfig;
-import io.enmasse.systemtest.iot.IoTTestSession.Adapter;
-
-@Tag(FRAMEWORK)
-public class IoTTestSessionTest {
-
- @Test
- public void testNameInDefaultConfig() throws Exception {
- var config = IoTTestSession.createDefaultConfig("default-ns", true).build();
-
- assertDefaultConfig(config);
- }
-
- @Test
- public void testNameInDefaultConfigAfterChange() throws Exception {
- var configBuilder = IoTTestSession.createDefaultConfig("default-ns", true);
-
- assertDefaultConfig(configBuilder.build());
-
- for (Adapter adapter : Adapter.values()) {
- configBuilder = adapter.disable(configBuilder);
- }
- configBuilder = HTTP.enable(configBuilder);
-
- assertDefaultConfig(configBuilder.build());
-
- }
-
- private void assertDefaultConfig(IoTConfig config) {
- assertNotNull(config);
-
- assertNotNull(config.getMetadata());
- assertEquals("default", config.getMetadata().getName());
- assertEquals("default-ns", config.getMetadata().getNamespace());
- }
-
- @Test
- public void testEnableAdapter() throws Exception {
- AtomicBoolean called = new AtomicBoolean();
-
- IoTTestSession
- .create("default-ns", true)
- .adapters(Adapter.HTTP)
- .config(configBuilder -> {
-
- var config = configBuilder.build();
-
- assertNotNull(config.getSpec());
- assertNotNull(config.getSpec().getAdapters());
-
- assertNotNull(config.getSpec().getAdapters().getHttp());
- assertEquals(Boolean.TRUE, config.getSpec().getAdapters().getHttp().getEnabled());
-
- assertNotNull(config.getSpec().getAdapters().getMqtt());
- assertEquals(Boolean.FALSE, config.getSpec().getAdapters().getMqtt().getEnabled());
-
- called.set(true);
-
- });
-
- assertTrue(called.get());
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/KeyStoreCreatorTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/KeyStoreCreatorTest.java
deleted file mode 100644
index 60aae1db950..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/KeyStoreCreatorTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.time.Duration;
-import java.time.Instant;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
-
-import io.enmasse.systemtest.TestTag;
-import io.enmasse.systemtest.iot.DeviceCertificateManager.Mode;
-
-@Tag(TestTag.FRAMEWORK)
-public class KeyStoreCreatorTest {
-
- @Test
- public void testBasicRsa() throws Exception {
- var mgr = new DeviceCertificateManager(Mode.RSA, new X500Principal("O=EnMasse,C=IO"));
- var device = mgr.createDevice("foo", Instant.now(), Duration.ofDays(90));
- KeyStoreCreator.from(device.getKey().getPrivate(), device.getCertificate());
- }
-
- @Test
- public void testBasicEc() throws Exception {
- var mgr = new DeviceCertificateManager(Mode.EC, new X500Principal("O=EnMasse,C=IO"));
- var device = mgr.createDevice("foo", Instant.now(), Duration.ofDays(90));
- KeyStoreCreator.from(device.getKey().getPrivate(), device.getCertificate());
- }
-
- @ParameterizedTest(name = "testToByteArray-{0}")
- @EnumSource(Mode.class)
- public void testToByteArray(final Mode mode) throws Exception {
- var mgr = new DeviceCertificateManager(mode, new X500Principal("O=EnMasse,C=IO"));
- var device = mgr.createDevice("foo", Instant.now(), Duration.ofDays(90));
-
- byte[] bytes = KeyStoreCreator.toByteArray(device.getKey().getPrivate(), device.getCertificate());
-
- assertNotNull(bytes);
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/MessageSendTesterTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/MessageSendTesterTest.java
deleted file mode 100644
index a74c23fa442..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/MessageSendTesterTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.systemtest.TestTag;
-import io.vertx.core.json.JsonObject;
-
-@Tag(TestTag.FRAMEWORK)
-public class MessageSendTesterTest {
-
- @Test
- public void testFillingEmpty() {
- final JsonObject json = new JsonObject();
- var result = MessageSendTester.fillWithPayload(json, 1024);
- assertEquals(1024, result.length());
- }
-
- @Test
- public void testFillUtf8() {
- final JsonObject json = new JsonObject();
- json.put("some-utf-8", "\u1F926");
- var result = MessageSendTester.fillWithPayload(json, 1024);
- assertEquals(1024, result.length());
- }
-
- @Test
- public void testFillingNonEmpty() {
-
- final int fixedLength = "{\"init\":\"\"}".getBytes(StandardCharsets.UTF_8).length;
-
- for (int initialLength = fixedLength; initialLength < 1024; initialLength++) {
-
- final char init[] = new char[initialLength - fixedLength];
- Arrays.fill(init, 'b');
- final String initValue = String.valueOf(init);
-
- for (int expectedLength = initialLength + MessageSendTester.FIXED_JSON_EXTRA_SIZE + 1; expectedLength < 1024; expectedLength++) {
-
- final JsonObject json = new JsonObject();
- json.put("init", initValue);
-
- var result = MessageSendTester.fillWithPayload(json, expectedLength);
- assertEquals(expectedLength, result.length());
-
- }
-
- }
-
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/StandardIoTTests.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/StandardIoTTests.java
deleted file mode 100644
index 277a841e8e9..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/StandardIoTTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot;
-
-import java.util.List;
-
-public interface StandardIoTTests extends IoTTests {
-
- /**
- * Test the test session.
- */
- public IoTTestSession getSession();
-
- /**
- * Get a list of devices which must succeed.
- */
- public List getDevices();
-
- /**
- * Get a list of devices which must fail.
- */
- public List getInvalidDevices();
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/http/StandardIoTHttpTests.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/http/StandardIoTHttpTests.java
deleted file mode 100644
index 6796c8ad454..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/http/StandardIoTHttpTests.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.http;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.iot.HttpAdapterClient.causedBy;
-import static io.enmasse.systemtest.iot.HttpAdapterClient.ResponseException.statusCode;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.time.Duration;
-import java.util.concurrent.TimeoutException;
-
-import javax.net.ssl.SSLHandshakeException;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.enmasse.systemtest.iot.DeviceSupplier;
-import io.enmasse.systemtest.iot.HttpAdapterClient;
-import io.enmasse.systemtest.iot.MessageSendTester;
-import io.enmasse.systemtest.iot.MessageSendTester.ConsumerFactory;
-import io.enmasse.systemtest.iot.StandardIoTTests;
-
-public interface StandardIoTHttpTests extends StandardIoTTests {
-
- static final Logger log = LoggerFactory.getLogger(StandardIoTHttpTests.class);
-
- /**
- * Single telemetry message with attached consumer.
- */
- @Tag(ACCEPTANCE)
- @ParameterizedTest(name = "testHttpTelemetrySingle-{0}")
- @MethodSource("getDevices")
- default void testHttpTelemetrySingle(final DeviceSupplier device) throws Exception {
-
- try (HttpAdapterClient client = device.get().createHttpAdapterClient()) {
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .delay(Duration.ofSeconds(1))
- .consumerFactory(ConsumerFactory.of(getSession().getConsumerClient(), getSession().getTenantId()))
- .sender(client::send)
- .amount(1)
- .consume(MessageSendTester.Consume.BEFORE)
- .execute();
- }
-
- }
-
- /**
- * Test a single event message.
- *
- * This is required by e.g. the MQTT protocol, as the topic name counts against the total length of
- * the MQTT payload.
- *
- * @param type the type to send.
- *
- * @return The number of bytes to remove from the payload.
- */
- protected int reducePayloadBy(final Type type) {
- return 0;
- }
-
- @Test
- public void testDecreasedMaxPayloadDefault() throws Exception {
-
- IoTTestSession
- .createDefault()
- .adapters(adapter())
- .config(config -> config
- .editOrNewSpec()
- .editOrNewAdapters()
- .editOrNewDefaults()
- .withMaxPayloadSize(256)
- .endDefaults()
- .endAdapters()
- .endSpec())
- .run(session -> {
-
- var device = session
- .newDevice("4711")
- .register()
- .setPassword("auth-1", "123456");
-
- // we expect the sending to fail, due to timeouts, as the payload exceeds the maximum
-
- assertThrows(TimeoutException.class, () -> {
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .payloadSize(1024 - reducePayloadBy(MessageSendTester.Type.TELEMETRY))
- .delay(Duration.ofSeconds(1))
- .consumerFactory(ConsumerFactory.of(session.getConsumerClient(), session.getTenantId()))
- .sender(sender(device))
- .amount(50)
- .consume(MessageSendTester.Consume.BEFORE)
- .execute();
- });
-
- });
-
- }
-
- @Test
- public void testIncreasedMaxPayloadDefault() throws Exception {
-
- IoTTestSession
- .createDefault()
- .adapters(adapter())
- .config(config -> config
- .editOrNewSpec()
- .editOrNewAdapters()
- .editOrNewDefaults()
- .withMaxPayloadSize(16 * 1024)
- .endDefaults()
- .endAdapters()
- .endSpec())
- .run(session -> {
-
- var device = session
- .newDevice("4711")
- .register()
- .setPassword("auth-1", "123456");
-
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .payloadSize((16 * 1024) - reducePayloadBy(MessageSendTester.Type.TELEMETRY))
- .delay(Duration.ofSeconds(1))
- .consumerFactory(ConsumerFactory.of(session.getConsumerClient(), session.getTenantId()))
- .sender(sender(device))
- .amount(50)
- .consume(MessageSendTester.Consume.BEFORE)
- .execute();
- });
-
- }
-
- @Test
- public void testStandardMaxPayloadDefault() throws Exception {
-
- IoTTestSession
- .createDefault()
- .adapters(adapter())
- .run(session -> {
-
- var device = session
- .newDevice("4711")
- .register()
- .setPassword("auth-1", "123456");
-
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .payloadSize(1024 - reducePayloadBy(MessageSendTester.Type.TELEMETRY))
- .delay(Duration.ofSeconds(1))
- .consumerFactory(ConsumerFactory.of(session.getConsumerClient(), session.getTenantId()))
- .sender(sender(device))
- .amount(50)
- .consume(MessageSendTester.Consume.BEFORE)
- .execute();
- });
-
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/IoTProjectManagedTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/IoTProjectManagedTest.java
deleted file mode 100644
index 8cdc076141a..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/IoTProjectManagedTest.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * Copyright 2018-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.iot.isolated;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.TestTag.SMOKE;
-import static io.enmasse.systemtest.iot.DefaultDeviceRegistry.newDefaultInstance;
-import static io.enmasse.systemtest.time.TimeoutBudget.ofDuration;
-import static io.enmasse.user.model.v1.Operation.recv;
-import static io.enmasse.user.model.v1.Operation.send;
-import static java.time.Duration.ofMinutes;
-import static java.util.Arrays.asList;
-import static java.util.EnumSet.of;
-import static java.util.Optional.ofNullable;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.beans.HasPropertyWithValue.hasProperty;
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
-import static org.hamcrest.core.AllOf.allOf;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.hamcrest.Matcher;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-
-import io.enmasse.address.model.Address;
-import io.enmasse.address.model.AddressSpace;
-import io.enmasse.address.model.AddressSpaceStatus;
-import io.enmasse.address.model.AddressStatus;
-import io.enmasse.address.model.KubeUtil;
-import io.enmasse.address.model.Phase;
-import io.enmasse.iot.model.v1.DoneableIoTProject;
-import io.enmasse.iot.model.v1.IoTProject;
-import io.enmasse.iot.model.v1.IoTProjectList;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.iot.ITestIoTIsolated;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.logs.CustomLogger;
-import io.enmasse.systemtest.model.address.AddressType;
-import io.enmasse.systemtest.model.addressplan.DestinationPlan;
-import io.enmasse.systemtest.model.addressspace.AddressSpacePlans;
-import io.enmasse.systemtest.model.addressspace.AddressSpaceType;
-import io.enmasse.systemtest.platform.Kubernetes;
-import io.enmasse.systemtest.time.TimeoutBudget;
-import io.enmasse.systemtest.utils.AddressUtils;
-import io.enmasse.systemtest.utils.IoTUtils;
-import io.enmasse.systemtest.utils.TestUtils;
-import io.enmasse.user.model.v1.Operation;
-import io.enmasse.user.model.v1.User;
-import io.enmasse.user.model.v1.UserAuthorization;
-import io.enmasse.user.model.v1.UserStatus;
-import io.fabric8.kubernetes.api.model.Doneable;
-import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.OwnerReference;
-import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.fabric8.kubernetes.client.dsl.Resource;
-
-class IoTProjectManagedTest extends TestBase implements ITestIoTIsolated {
- private final static Logger log = CustomLogger.getLogger();
-
- @FunctionalInterface
- interface ProjectModificator {
- /**
- * Modify a project
- *
- * @param timeout The timeout budget the operation has available.
- * @param project The project to work with. It is an provisioned project, which already passed a
- * call to {@link IoTProjectManagedTest#assertManaged(IoTProject)}.
- * @return {@code true} if the state has been change and a final call to
- * {@link IoTProjectManagedTest#assertManaged(IoTProject)} to be performed.
- */
- boolean modify(TimeoutBudget timeout, IoTProject project) throws Exception;
- }
-
- private Kubernetes kubernetes = Kubernetes.getInstance();
-
- private MixedOperation> projectClient;
-
- @BeforeEach
- void createIoTClient() {
- this.projectClient = this.kubernetes.getIoTProjectClient(IOT_PROJECT_NAMESPACE);
- }
-
- /**
- * Simply create a project and directly test it.
- */
- @Test
- @Tag(SMOKE)
- @Tag(ACCEPTANCE)
- void testCreate() throws Exception {
- // run a default test, with no modifications
- doTestAddressSpaceWithModifications(ofDuration(ofMinutes(5)), (timeout, project) -> false);
- }
-
- /**
- * Delete a resource and wait for it to be re-created properly.
- *
- * @param The resource type.
- * @param The list type of the resource.
- * @param The {@link Doneable} type.
- * @param project The IoT project to process.
- * @param clazz The class instance of the resource type.
- * @param name The kubernetes name of the resource.
- * @param basicClient The basic resource client. Does not need to be namespaced.
- * @param phaseExtractor The function which extracts the phase information.
- */
- ProjectModificator deleteAndWaitResource(final Class clazz, final Function nameExtractor,
- final MixedOperation> basicClient, final Function> phaseExtractor) {
-
- return (timeout, project) -> {
-
- final var name = nameExtractor.apply(project);
- final var className = clazz.getSimpleName();
- final var client = basicClient.inNamespace(IOT_PROJECT_NAMESPACE);
-
- // get the current address space
-
- final var namedClient = client.withName(name);
- final var currentResource = namedClient.get();
- assertNotNull(currentResource, () -> String.format("Unable to find resource - type: %s, name: '%s'", className, name));
-
- // remember its ID
-
- final String originalId = currentResource.getMetadata().getUid();
- assertNotNull(originalId);
-
- // delete it
-
- client.withName(name).delete();
-
- // now wait for it to be re-created
-
- TestUtils.waitUntilConditionOrFail(() -> {
-
- var current = namedClient.get();
- if (current == null) {
- log.info("{} is still missing", className);
- return false;
- }
- if (originalId.equals(current.getMetadata().getUid())) {
- log.info("{} has still the same ID", className);
- // still the same object
- return false;
- }
-
- // get current phase
- final var phase = phaseExtractor.apply(current);
- if (!phase.isPresent()) {
- log.info("{} no phase information", className);
- return false;
- }
-
- if (phase.get() != Phase.Active) {
- log.info("{} is not ready yet: {}", className, phase.get());
- return false;
- }
-
- return true;
- }, timeout.remaining(), Duration.ofSeconds(10), () -> className + " did not get re-created");
-
- // and wait for the IoT project to become ready again
-
- var projectAccess = kubernetes.getIoTProjectClient(project.getMetadata().getNamespace()).withName(project.getMetadata().getName());
- TestUtils.waitUntilConditionOrFail(() -> {
- var current = projectAccess.get();
-
- if (current == null) {
- log.info("IoTProject missing");
- return false;
- }
-
- if (current.getStatus() == null || current.getStatus().getPhase() == null) {
- log.info("IoTProject is missing status information");
- return false;
- }
-
- if (!current.getStatus().getPhase().equals("Active")) {
- return false;
- }
-
- return true;
- }, timeout.remaining(), Duration.ofSeconds(10), () -> "IoTProject failed to switch back to 'Active'");
-
- return true;
- };
- }
-
- /**
- * Test deleting the whole address space.
- */
- @Test
- void testDeleteAddressSpace() throws Exception {
- doTestAddressSpaceWithModifications(
- ofDuration(ofMinutes(15)),
- deleteAndWaitResource(
- AddressSpace.class,
- project -> project.getSpec().getDownstreamStrategy().getManagedStrategy().getAddressSpace().getName(),
- kubernetes.getAddressSpaceClient(),
- addressSpace -> ofNullable(addressSpace).map(AddressSpace::getStatus).map(AddressSpaceStatus::getPhase)));
- }
-
- /**
- * Test deleting the telememtry address.
- */
- @Test
- void testDeleteTelemetryAddress() throws Exception {
- doTestAddressSpaceWithModifications(
- ofDuration(ofMinutes(10)),
- deleteAndWaitResource(
- Address.class,
- project -> KubeUtil.sanitizeForGo(
- project.getSpec().getDownstreamStrategy().getManagedStrategy().getAddressSpace().getName(),
- "telemetry/" + project.getStatus().getTenantName()),
- kubernetes.getAddressClient(),
- address -> ofNullable(address).map(Address::getStatus).map(AddressStatus::getPhase)));
- }
-
- /**
- * Test deleting the event address.
- * addresses = AddressUtils.getAddresses(addressSpace);
- // assert that we have the right number of addresses
- assertEquals(5, addresses.size());
- // assert that all addresses have the project set as owner
- assertEquals(5, addresses.stream()
- .map(Address::getMetadata)
- .map(ObjectMeta::getOwnerReferences)
- .flatMap(List::stream)
- .filter(reference -> isOwner(project, reference))
- .count());
-
- int correctAddressesCounter = 0;
- for (Address address : addresses) {
-
- final String addressName = address.getSpec().getAddress();
-
- if (addressName.equals(IOT_ADDRESS_EVENT + addressSuffix)) {
-
- assertAddressType(address, AddressType.QUEUE, DestinationPlan.STANDARD_SMALL_QUEUE);
- correctAddressesCounter++;
-
- } else if (addressName.equals(IOT_ADDRESS_CONTROL + addressSuffix)
- || addressName.equals(IOT_ADDRESS_TELEMETRY + addressSuffix)
- || addressName.equals(IOT_ADDRESS_COMMAND + addressSuffix)
- || addressName.equals(IOT_ADDRESS_COMMAND_RESPONSE + addressSuffix)) {
-
- assertAddressType(address, AddressType.ANYCAST, DestinationPlan.STANDARD_SMALL_ANYCAST);
- correctAddressesCounter++;
-
- }
-
- assertEquals(Phase.Active, address.getStatus().getPhase());
-
- }
- assertEquals(5, correctAddressesCounter, "There are incorrect IoT addresses " + addresses);
-
- // username "adapter"
- // name "project-address-space"+".adapter"
- User user = isolatedIoTManager.getUser(addressSpace, "adapter-" + project.getMetadata().getUid());
- assertNotNull(user);
- assertEquals(1, user.getMetadata().getOwnerReferences().size());
- assertTrue(isOwner(project, user.getMetadata().getOwnerReferences().get(0)));
-
- final List authorizations = user.getSpec().getAuthorization();
-
- assertThat(authorizations, hasSize(3));
-
- assertThat(authorizations, containsInAnyOrder(
- asList(
- assertAdapterAuthorization(of(send), expandAddresses(addressSuffix, IOT_ADDRESS_TELEMETRY, IOT_ADDRESS_EVENT, IOT_ADDRESS_COMMAND_RESPONSE)),
- assertAdapterAuthorization(of(recv), expandAddresses(addressSuffix, IOT_ADDRESS_COMMAND)),
- assertAdapterAuthorization(of(recv, send), expandAddresses(addressSuffix, IOT_ADDRESS_CONTROL)))));
- }
-
- /**
- * Assert an authorization entry.
- *
- * @param operations The expected operations.
- * @param addresses The expected addresses.
- * @return A matcher, asserting the entry.
- */
- private static Matcher assertAdapterAuthorization(final Set operations, final Set addresses) {
-
- return allOf(asList(
-
- hasProperty("operations", containsInAnyOrder(operations.toArray(Operation[]::new))),
- hasProperty("addresses", containsInAnyOrder(addresses.toArray(String[]::new)))
-
- ));
-
- }
-
- /**
- * Expand addresses to match ACLs.
- *
- * @param addressSuffix The "suffix" (tenant) of the address.
- * @return A set of all addresses.
- */
- private static Set expandAddresses(final String addressSuffix, final String... baseAddresses) {
-
- return Arrays
- .stream(baseAddresses)
- .flatMap(address -> {
- return Stream.of(
- address + addressSuffix,
- address + addressSuffix + "/*");
- })
-
- .collect(Collectors.toSet());
-
- }
-
- /**
- * Test if the project is the owner the reference points to.
- *
- * @param project The project to check for.
- * @param ownerReference The reference to check.
- * @return {@code true} if the reference points to the project.
- */
- private boolean isOwner(final IoTProject project, final OwnerReference ownerReference) {
- return ownerReference.getKind().equals(IoTProject.KIND) &&
- project.getMetadata().getName().equals(ownerReference.getName());
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/MultipleProjectsTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/MultipleProjectsTest.java
deleted file mode 100644
index bf470525fc2..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/MultipleProjectsTest.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.iot.isolated;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.iot.DefaultDeviceRegistry.newDefaultInstance;
-
-import java.net.HttpURLConnection;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.paho.client.mqttv3.IMqttClient;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.slf4j.Logger;
-
-import io.enmasse.address.model.AddressSpace;
-import io.enmasse.iot.model.v1.IoTConfig;
-import io.enmasse.iot.model.v1.IoTProject;
-import io.enmasse.systemtest.Endpoint;
-import io.enmasse.systemtest.TestTag;
-import io.enmasse.systemtest.amqp.AmqpClient;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.iot.ITestIoTIsolated;
-import io.enmasse.systemtest.iot.CredentialsRegistryClient;
-import io.enmasse.systemtest.iot.DeviceRegistryClient;
-import io.enmasse.systemtest.iot.HttpAdapterClient;
-import io.enmasse.systemtest.iot.IoTProjectTestContext;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.MessageSendTester;
-import io.enmasse.systemtest.iot.MessageSendTester.ConsumerFactory;
-import io.enmasse.systemtest.logs.CustomLogger;
-import io.enmasse.systemtest.mqtt.MqttClientFactory;
-import io.enmasse.systemtest.time.TimeoutBudget;
-import io.enmasse.systemtest.time.WaitPhase;
-import io.enmasse.systemtest.utils.IoTUtils;
-import io.enmasse.systemtest.utils.TestUtils;
-import io.enmasse.user.model.v1.Operation;
-import io.enmasse.user.model.v1.User;
-import io.enmasse.user.model.v1.UserAuthenticationType;
-import io.enmasse.user.model.v1.UserAuthorizationBuilder;
-import io.enmasse.user.model.v1.UserBuilder;
-
-@Tag(TestTag.SMOKE)
-class MultipleProjectsTest extends TestBase implements ITestIoTIsolated {
- private static Logger log = CustomLogger.getLogger();
- private DeviceRegistryClient registryClient;
- private CredentialsRegistryClient credentialsClient;
-
- private int numberOfProjects = 2;
- private List projects = new ArrayList<>();
-
- @BeforeEach
- void initEnv() throws Exception {
- IoTConfig iotConfig = IoTTestSession.createDefaultConfig()
- .editOrNewSpec().withServices(newDefaultInstance()).endSpec()
- .build();
- isolatedIoTManager.createIoTConfig(iotConfig);
-
- Endpoint deviceRegistryEndpoint = IoTUtils.getDeviceRegistryManagementEndpoint();
- registryClient = new DeviceRegistryClient(deviceRegistryEndpoint);
- credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint);
-
- for (int i = 1; i <= numberOfProjects; i++) {
- String projectName = String.format("project-%s", i);
-
- kubernetes.createNamespace(projectName);
-
- IoTProject project = IoTUtils.getBasicIoTProjectObject(projectName, projectName,
- projectName, getDefaultAddressSpacePlan());
- isolatedIoTManager.createIoTProject(project);
- IoTProjectTestContext ctx = new IoTProjectTestContext(projectName, project);
-
- configureDeviceSide(ctx);
-
- configureAmqpSide(ctx);
-
- projects.add(ctx);
- }
- }
-
- @AfterEach
- void cleanEnv(ExtensionContext context) throws Exception {
- for (IoTProjectTestContext ctx : projects) {
- cleanDeviceSide(ctx);
- cleanAmqpSide(ctx);
- }
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testMultipleProjects() throws Exception {
-
- for (final IoTProjectTestContext ctx : projects) {
- try (var http = ctx.getHttpAdapterClient()) {
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .delay(Duration.ofSeconds(1))
- .consumerFactory(ConsumerFactory.of(ctx.getAmqpClient(), IoTUtils.getTenantId(ctx.getProject())))
- .sender(http::send)
- .amount(50)
- .consume(MessageSendTester.Consume.BEFORE)
- .execute();
-
- new MessageSendTester()
- .type(MessageSendTester.Type.EVENT)
- .delay(Duration.ofMillis(100))
- .consumerFactory(ConsumerFactory.of(ctx.getAmqpClient(), IoTUtils.getTenantId(ctx.getProject())))
- .sender(http::send)
- .amount(5)
- .consume(MessageSendTester.Consume.AFTER)
- .execute();
- }
- }
-
- }
-
- private void configureAmqpSide(IoTProjectTestContext ctx) throws Exception {
- AddressSpace addressSpace = isolatedIoTManager.getAddressSpace(ctx.getNamespace(),
- ctx.getProject().getSpec().getDownstreamStrategy().getManagedStrategy().getAddressSpace().getName());
- User amqpUser = configureAmqpUser(ctx.getProject(), addressSpace);
- ctx.setAmqpUser(amqpUser);
- AmqpClient amqpClient = configureAmqpClient(addressSpace, amqpUser);
- ctx.setAmqpClient(amqpClient);
- }
-
- private User configureAmqpUser(IoTProject project, AddressSpace addressSpace) {
- String tenant = IoTUtils.getTenantId(project);
-
- User amqpUser = new UserBuilder()
-
- .withNewMetadata()
- .withName(String.format("%s.%s", addressSpace.getMetadata().getName(), project.getMetadata().getName()))
- .endMetadata()
-
- .withNewSpec()
- .withUsername(UUID.randomUUID().toString())
- .withNewAuthentication()
- .withPassword(Base64.getEncoder().encodeToString(UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8)))
- .withType(UserAuthenticationType.password)
- .endAuthentication()
- .withAuthorization(Collections.singletonList(new UserAuthorizationBuilder()
- .withAddresses(IOT_ADDRESS_TELEMETRY + "/" + tenant,
- IOT_ADDRESS_TELEMETRY + "/" + tenant + "/*",
- IOT_ADDRESS_EVENT + "/" + tenant,
- IOT_ADDRESS_EVENT + "/" + tenant + "/*")
- .withOperations(Operation.recv)
- .build()))
- .endSpec()
- .build();
- kubernetes.getUserClient(project.getMetadata().getNamespace()).create(amqpUser);
-
- return amqpUser;
- }
-
- private AmqpClient configureAmqpClient(AddressSpace addressSpace, User user) throws Exception {
- LOGGER.warn("Amqp factory: " + getAmqpClientFactory());
- AmqpClient amqpClient = getAmqpClientFactory().createQueueClient(addressSpace);
- amqpClient.getConnectOptions()
- .setUsername(user.getSpec().getUsername())
- .setPassword(new String(Base64.getDecoder().decode(user.getSpec().getAuthentication().getPassword())));
- return amqpClient;
- }
-
- private void cleanAmqpSide(IoTProjectTestContext ctx) throws Exception {
- ctx.getAmqpClient().close();
- var userClient = kubernetes.getUserClient(ctx.getNamespace());
- userClient.withName(ctx.getAmqpUser().getMetadata().getName()).cascading(true).delete();
- }
-
- private void configureDeviceSide(IoTProjectTestContext ctx) throws Exception {
- String tenant = IoTUtils.getTenantId(ctx.getProject());
- ctx.setDeviceId(UUID.randomUUID().toString());
- ctx.setDeviceAuthId(UUID.randomUUID().toString());
- ctx.setDevicePassword(UUID.randomUUID().toString());
- registryClient.registerDevice(tenant, ctx.getDeviceId());
- credentialsClient.addCredentials(tenant, ctx.getDeviceId(), ctx.getDeviceAuthId(), ctx.getDevicePassword(), null, HttpURLConnection.HTTP_NO_CONTENT);
- Endpoint httpAdapterEndpoint = kubernetes.getExternalEndpoint("iot-http-adapter");
- ctx.setHttpAdapterClient(new HttpAdapterClient(httpAdapterEndpoint, ctx.getDeviceAuthId(), tenant, ctx.getDevicePassword()));
- IMqttClient mqttAdapterClient = new MqttClientFactory.Builder()
- .clientId(ctx.getDeviceId())
- .endpoint(kubernetes.getExternalEndpoint("iot-mqtt-adapter"))
- .usernameAndPassword(ctx.getDeviceAuthId() + "@" + tenant, ctx.getDevicePassword())
- .mqttConnectionOptions(options -> {
- options.setAutomaticReconnect(true);
- options.setConnectionTimeout(60);
- options.setHttpsHostnameVerificationEnabled(false);
- })
- .create();
- TestUtils.waitUntilCondition("Successfully connect to mqtt adapter", phase -> {
- try {
- mqttAdapterClient.connect();
- return true;
- } catch (MqttException mqttException) {
- if (phase == WaitPhase.LAST_TRY) {
- log.error("Error waiting to connect mqtt adapter", mqttException);
- }
- return false;
- }
- }, new TimeoutBudget(1, TimeUnit.MINUTES));
- log.info("Connection to mqtt adapter succeeded");
- ctx.setMqttAdapterClient(mqttAdapterClient);
- }
-
- private void cleanDeviceSide(IoTProjectTestContext ctx) throws Exception {
- String tenant = IoTUtils.getTenantId(ctx.getProject());
- String deviceId = ctx.getDeviceId();
- credentialsClient.deleteAllCredentials(tenant, deviceId);
- registryClient.deleteDeviceRegistration(tenant, deviceId);
- registryClient.getDeviceRegistration(tenant, deviceId, HttpURLConnection.HTTP_NOT_FOUND);
- ctx.getHttpAdapterClient().close();
- ctx.getMqttAdapterClient().close();
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/SimpleK8sDeployTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/SimpleK8sDeployTest.java
deleted file mode 100644
index 0dcbe0bab1b..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/SimpleK8sDeployTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated;
-
-import static io.enmasse.systemtest.TestTag.SMOKE;
-import static io.enmasse.systemtest.time.TimeoutBudget.ofDuration;
-import static java.time.Duration.ofMinutes;
-import static java.util.Collections.singletonMap;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.enmasse.iot.model.v1.CommonAdapterContainersBuilder;
-import io.enmasse.iot.model.v1.ContainerConfigBuilder;
-import io.enmasse.iot.model.v1.IoTConfig;
-import io.enmasse.iot.model.v1.JavaContainerConfigBuilder;
-import io.enmasse.systemtest.Environment;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.iot.ITestIoTIsolated;
-import io.enmasse.systemtest.condition.Kubernetes;
-import io.enmasse.systemtest.iot.DefaultDeviceRegistry;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.platform.KubeCMDClient;
-import io.enmasse.systemtest.platform.apps.SystemtestsKubernetesApps;
-import io.enmasse.systemtest.utils.IoTUtils;
-import io.enmasse.systemtest.utils.TestUtils;
-import io.fabric8.kubernetes.api.model.Quantity;
-
-@Tag(SMOKE)
-@Kubernetes
-class SimpleK8sDeployTest extends TestBase implements ITestIoTIsolated {
-
- private static final Logger log = LoggerFactory.getLogger(SimpleK8sDeployTest.class);
- private static final String NAMESPACE = Environment.getInstance().namespace();
- private static IoTConfig config;
- private io.enmasse.systemtest.platform.Kubernetes client = io.enmasse.systemtest.platform.Kubernetes.getInstance();
-
- @BeforeAll
- static void setup() throws Exception {
- Map secrets = new HashMap<>();
- secrets.put("iot-auth-service", "systemtests-iot-auth-service-tls");
- secrets.put("iot-tenant-service", "systemtests-iot-tenant-service-tls");
- secrets.put("iot-device-connection", "systemtests-iot-device-connection-tls");
- secrets.put("iot-device-registry", "systemtests-iot-device-registry-tls");
-
- var r1 = new ContainerConfigBuilder()
- .withNewResources().addToLimits("memory", new Quantity("64Mi")).endResources()
- .build();
- var j2 = new JavaContainerConfigBuilder()
- .withNewContainerConfig()
- .withNewResources().addToLimits("memory", new Quantity("256Mi")).endResources()
- .endContainerConfig()
- .build();
-
- var commonContainers = new CommonAdapterContainersBuilder()
- .withNewAdapterLike(j2).endAdapter()
- .withNewProxyLike(r1).endProxy()
- .withNewProxyConfiguratorLike(r1).endProxyConfigurator()
- .build();
-
- var jdbcEndpoint = SystemtestsKubernetesApps.deployPostgresqlServer();
-
- config = IoTTestSession.createDefaultConfig()
-
- .editOrNewSpec()
-
- .editOrNewAdapters()
-
- .editOrNewHttp()
- .withNewContainersLike(commonContainers).endContainers()
- .endHttp()
-
- .editOrNewMqtt()
- .withNewContainersLike(commonContainers).endContainers()
- .endMqtt()
-
- .editOrNewSigfox()
- .withNewContainersLike(commonContainers).endContainers()
- .endSigfox()
-
- .editOrNewLoraWan()
- .withNewContainersLike(commonContainers).endContainers()
- .endLoraWan()
-
- .endAdapters()
-
- .withNewServices()
-
- .withNewAuthentication()
- .withNewContainerLike(j2).endContainer()
- .endAuthentication()
-
- .withNewTenant()
- .withNewContainerLike(j2).endContainer()
- .endTenant()
-
- .withDeviceConnection(DefaultDeviceRegistry.newPostgresBasedConnection(jdbcEndpoint))
- .withDeviceRegistry(DefaultDeviceRegistry.newPostgresBasedRegistry(jdbcEndpoint, false))
-
- .editDeviceConnection()
- .editJdbc()
- .editOrNewCommonServiceConfig()
- .withNewContainerLike(j2).endContainer()
- .endCommonServiceConfig()
- .endJdbc()
- .endDeviceConnection()
-
- .editDeviceRegistry()
- .editJdbc()
- .editServer()
- .editExternal()
- .editManagement()
- .editOrNewCommonConfig()
- .withNewContainerLike(j2).endContainer()
- .endCommonConfig()
- .endManagement()
- .endExternal()
- .endServer()
- .endJdbc()
- .endDeviceRegistry()
-
- .endServices()
-
- .endSpec()
- .build();
-
- final Path configTempFile = Files.createTempFile("iot-config", "json");
- try {
- Files.write(configTempFile, new ObjectMapper().writeValueAsBytes(config));
- KubeCMDClient.createFromFile(NAMESPACE, configTempFile);
- } finally {
- Files.deleteIfExists(configTempFile);
- }
- }
-
- @AfterAll
- static void cleanup() throws Exception {
- KubeCMDClient.deleteIoTConfig(NAMESPACE, "default");
- log.info("Waiting for IoT components to be removed");
- TestUtils.waitForNReplicas(0, NAMESPACE, singletonMap("component", "iot"), ofDuration(ofMinutes(5)));
- }
-
- @Test
- void testDeploy() throws Exception {
- IoTUtils.waitForIoTConfigReady(client, config);
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/http/HttpAdapterTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/http/HttpAdapterTest.java
deleted file mode 100644
index ee4098122a3..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/http/HttpAdapterTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.http;
-
-import static io.enmasse.systemtest.TestTag.ISOLATED_IOT;
-import static io.enmasse.systemtest.iot.DeviceSupplier.named;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.HTTP;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
-
-import io.enmasse.systemtest.iot.DeviceSupplier;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.http.StandardIoTHttpTests;
-
-@Tag(ISOLATED_IOT)
-class HttpAdapterTest implements StandardIoTHttpTests {
-
- private static IoTTestSession session;
-
- @BeforeAll
- public static void setup() throws Exception {
- session = IoTTestSession.createDefault()
- .adapters(HTTP)
- .deploy();
- }
-
- @AfterAll
- public static void cleanup() throws Exception {
- if (session != null) {
- session.close();
- session = null;
- }
- }
-
- @Override
- public List getDevices() {
- return Arrays.asList(
- named("default", () -> session.newDevice()
- .register()
- .setPassword()));
- }
-
- @Override
- public List getInvalidDevices() {
- return Arrays.asList(
- named("invalidPassword", () -> session.newDevice()
- .register()
- .setPassword()
- .overridePassword()));
- }
-
- @Override
- public IoTTestSession getSession() {
- return session;
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/http/MaxPayloadSizeTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/http/MaxPayloadSizeTest.java
deleted file mode 100644
index 7b57b6375fd..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/http/MaxPayloadSizeTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.http;
-
-import static io.enmasse.systemtest.iot.HttpAdapterClient.ResponseException.statusCode;
-
-import io.enmasse.systemtest.iot.IoTTestSession.Adapter;
-import io.enmasse.systemtest.iot.IoTTestSession.Device;
-import io.enmasse.systemtest.iot.MessageSendTester.Sender;
-import io.enmasse.systemtest.iot.isolated.AbstractMaxPayloadSizeTest;
-
-public class MaxPayloadSizeTest extends AbstractMaxPayloadSizeTest {
-
- @Override
- protected Adapter adapter() {
- return Adapter.HTTP;
- }
-
- @SuppressWarnings("resource")
- @Override
- protected Sender sender(Device device) throws Exception {
- return cleanup(device
- .createHttpAdapterClient()
- .suppressExceptions(statusCode(413)))::send;
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/mqtt/MaxPayloadSizeTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/mqtt/MaxPayloadSizeTest.java
deleted file mode 100644
index 5acfc5fb908..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/mqtt/MaxPayloadSizeTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.mqtt;
-
-import java.nio.charset.StandardCharsets;
-
-import io.enmasse.systemtest.iot.IoTTestSession.Adapter;
-import io.enmasse.systemtest.iot.IoTTestSession.Device;
-import io.enmasse.systemtest.iot.MessageSendTester.Sender;
-import io.enmasse.systemtest.iot.MessageSendTester.Type;
-import io.enmasse.systemtest.iot.isolated.AbstractMaxPayloadSizeTest;
-
-public class MaxPayloadSizeTest extends AbstractMaxPayloadSizeTest {
-
- @Override
- protected int reducePayloadBy(final Type type) {
- // reduce by: 2 (length) + x (topic name) bytes + 2 (QoS 1 msg id)
- return 2 + type.type().address().getBytes(StandardCharsets.UTF_8).length + 2;
- }
-
- @Override
- protected Adapter adapter() {
- return Adapter.MQTT;
- }
-
- @SuppressWarnings("resource")
- @Override
- protected Sender sender(Device device) throws Exception {
- return cleanup(device.createMqttAdapterClient())::sendQos1;
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/mqtt/MqttAdapterTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/mqtt/MqttAdapterTest.java
deleted file mode 100644
index 9cc2b8e715f..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/mqtt/MqttAdapterTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.mqtt;
-
-import static io.enmasse.systemtest.TestTag.ISOLATED_IOT;
-import static io.enmasse.systemtest.iot.DeviceSupplier.named;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.MQTT;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
-
-import io.enmasse.systemtest.iot.DeviceSupplier;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.mqtt.StandardIoTMqttTests;
-
-/**
- * Testing MQTT message transmission.
- */
-@Tag(ISOLATED_IOT)
-class MqttAdapterTest implements StandardIoTMqttTests {
-
- private static IoTTestSession session;
-
- @BeforeAll
- public static void setup() throws Exception {
- session = IoTTestSession.createDefault()
- .adapters(MQTT)
- .deploy();
- }
-
- @AfterAll
- public static void cleanup() throws Exception {
- if (session != null) {
- session.close();
- session = null;
- }
- }
-
- @Override
- public List getDevices() {
- return Arrays.asList(
- named("default", () -> session.newDevice()
- .register()
- .setPassword()));
- }
-
- @Override
- public List getInvalidDevices() {
- return Arrays.asList(
- named("invalidPassword", () -> session.newDevice()
- .register()
- .setPassword()
- .overridePassword()));
- }
-
- @Override
- public IoTTestSession getSession() {
- return session;
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/project/ManagedTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/project/ManagedTest.java
deleted file mode 100644
index eade350eb0e..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/project/ManagedTest.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.iot.isolated.project;
-
-import static io.enmasse.systemtest.iot.DefaultDeviceRegistry.newDefaultInstance;
-import static io.enmasse.systemtest.utils.AddressSpaceUtils.addressSpaceExists;
-import static io.enmasse.systemtest.utils.TestUtils.waitUntilConditionOrFail;
-import static java.time.Duration.ofMinutes;
-import static java.time.Duration.ofSeconds;
-import static org.hamcrest.collection.IsEmptyIterable.emptyIterable;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import java.net.HttpURLConnection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-import java.util.function.BiConsumer;
-
-import org.apache.qpid.proton.message.Message;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-
-import io.enmasse.address.model.Address;
-import io.enmasse.address.model.AddressList;
-import io.enmasse.address.model.AddressSpace;
-import io.enmasse.address.model.AddressSpaceList;
-import io.enmasse.address.model.DoneableAddress;
-import io.enmasse.address.model.DoneableAddressSpace;
-import io.enmasse.address.model.KubeUtil;
-import io.enmasse.iot.model.v1.DoneableIoTProject;
-import io.enmasse.iot.model.v1.IoTConfig;
-import io.enmasse.iot.model.v1.IoTProject;
-import io.enmasse.iot.model.v1.IoTProjectBuilder;
-import io.enmasse.iot.model.v1.IoTProjectList;
-import io.enmasse.systemtest.Endpoint;
-import io.enmasse.systemtest.UserCredentials;
-import io.enmasse.systemtest.amqp.AmqpClientFactory;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.iot.ITestIoTIsolated;
-import io.enmasse.systemtest.iot.CredentialsRegistryClient;
-import io.enmasse.systemtest.iot.DeviceRegistryClient;
-import io.enmasse.systemtest.iot.HttpAdapterClient;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.MessageSendTester;
-import io.enmasse.systemtest.iot.MessageSendTester.Type;
-import io.enmasse.systemtest.logs.CustomLogger;
-import io.enmasse.systemtest.utils.IoTUtils;
-import io.enmasse.user.model.v1.DoneableUser;
-import io.enmasse.user.model.v1.User;
-import io.enmasse.user.model.v1.UserList;
-import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.fabric8.kubernetes.client.dsl.Resource;
-
-public class ManagedTest extends TestBase implements ITestIoTIsolated {
-
- private static final String MANAGED_TEST_ADDRESSSPACE = "managed-test-addrspace";
-
- private static final Logger log = CustomLogger.getLogger();
-
- private MixedOperation> client;
- private MixedOperation> addressClient;
- private MixedOperation> addressSpaceClient;
- private MixedOperation> userClient;
- protected DeviceRegistryClient registryClient;
- protected CredentialsRegistryClient credentialsClient;
-
- private Endpoint httpAdapterEndpoint;
- private UserCredentials credentials;
-
- @BeforeEach
- public void initClients () throws Exception {
- IoTConfig iotConfig = IoTTestSession.createDefaultConfig()
- .editOrNewSpec().withServices(newDefaultInstance()).endSpec()
- .build();
-
- isolatedIoTManager.createIoTConfig(iotConfig);
-
- final Endpoint deviceRegistryEndpoint = IoTUtils.getDeviceRegistryManagementEndpoint();
- this.registryClient = new DeviceRegistryClient(deviceRegistryEndpoint);
- this.credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint);
- this.client = kubernetes.getIoTProjectClient(IOT_PROJECT_NAMESPACE);
- this.addressClient = kubernetes.getAddressClient(IOT_PROJECT_NAMESPACE);
- this.addressSpaceClient = kubernetes.getAddressSpaceClient(IOT_PROJECT_NAMESPACE);
- this.userClient = kubernetes.getUserClient(IOT_PROJECT_NAMESPACE);
- this.httpAdapterEndpoint = kubernetes.getExternalEndpoint("iot-http-adapter");
-
- this.credentials = new UserCredentials(UUID.randomUUID().toString(), UUID.randomUUID().toString());
- }
-
- @Test
- public void testChangeAddressSpace() throws Exception {
-
- var project = IoTUtils.getBasicIoTProjectObject("iot1", "as1",
- IOT_PROJECT_NAMESPACE, getDefaultAddressSpacePlan());
- isolatedIoTManager.createIoTProject(project);
-
- assertManagedResources(Assertions::assertNotNull, project, "as1");
-
- project = new IoTProjectBuilder(project)
- .editSpec()
- .editDownstreamStrategy()
- .editManagedStrategy()
- .editAddressSpace()
-
- .withName("as1a")
-
- .endAddressSpace()
- .endManagedStrategy()
- .endDownstreamStrategy()
- .endSpec()
- .build();
-
- // update the project
-
- log.info("Update project namespace");
- client.createOrReplace(project);
-
- // immediately after the change, the project is still ready but the new
- // address space is still missing, so we need to wait for it to be created
- // otherwise io.enmasse.systemtest.utils.IoTUtils.waitForIoTProjectReady(Kubernetes, IoTProject) will fail
-
- waitUntilConditionOrFail(
- addressSpaceExists(project.getMetadata().getNamespace(), project.getSpec().getDownstreamStrategy().getManagedStrategy().getAddressSpace().getName()),
- ofMinutes(5), ofSeconds(10),
- () -> String.format("Expected address space to be created"));
-
- // wait until the project and address space become ready
-
- log.info("For for project to become ready again");
- IoTUtils.waitForIoTProjectReady(kubernetes, project);
-
- // assert existence
-
- assertManagedResources(Assertions::assertNotNull, project, "as1a");
- assertManagedResources(Assertions::assertNull, project, "as1");
- }
-
- @Test
- public void testTwoManagedToTheSameAddressSpace() throws Exception {
-
- // first create two projects for a single address space
-
- var project1 = IoTUtils.getBasicIoTProjectObject("iot1", MANAGED_TEST_ADDRESSSPACE,
- IOT_PROJECT_NAMESPACE, getDefaultAddressSpacePlan());
- var project2 = IoTUtils.getBasicIoTProjectObject("iot2", MANAGED_TEST_ADDRESSSPACE,
- IOT_PROJECT_NAMESPACE, getDefaultAddressSpacePlan());
-
- var tenant1 = IoTUtils.getTenantId(project1);
- var tenant2 = IoTUtils.getTenantId(project2);
-
- // wait for the projects to be ready
-
- isolatedIoTManager.createIoTProject(project1);
- isolatedIoTManager.createIoTProject(project2);
-
- assertManagedResources(Assertions::assertNotNull, project1, MANAGED_TEST_ADDRESSSPACE);
- assertManagedResources(Assertions::assertNotNull, project2, MANAGED_TEST_ADDRESSSPACE);
-
- // register two devices with the same ids, but for different tenants
-
- this.registryClient.registerDevice(tenant1, "device1");
- this.registryClient.registerDevice(tenant2, "device1");
- this.credentialsClient.addPlainPasswordCredentials(tenant1, "device1", "auth1", "password1", null, HttpURLConnection.HTTP_NO_CONTENT);
- this.credentialsClient.addPlainPasswordCredentials(tenant2, "device1", "auth1", "password1", null, HttpURLConnection.HTTP_NO_CONTENT);
-
- // set up client
-
- isolatedIoTManager.createOrUpdateUser(isolatedIoTManager.getAddressSpace(IOT_PROJECT_NAMESPACE, MANAGED_TEST_ADDRESSSPACE), this.credentials);
- var iotAmqpClientFactory = new AmqpClientFactory(this.resourcesManager.getAddressSpace(IOT_PROJECT_NAMESPACE, MANAGED_TEST_ADDRESSSPACE), this.credentials);
- var amqpClient = iotAmqpClientFactory.createQueueClient();
-
- // now try to send some messages
-
- final List otherMessages = new LinkedList<>();
- try (
- var httpAdapterClient = new HttpAdapterClient(this.httpAdapterEndpoint, "auth1", tenant1, "password1");
- var otherReceiver = MessageSendTester.ConsumerFactory.of(amqpClient, tenant2).start(Type.TELEMETRY, msg -> otherMessages.add(msg)) ) {
-
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .amount(1)
- .consumerFactory(MessageSendTester.ConsumerFactory.of(amqpClient, tenant1))
- .sender(httpAdapterClient::send)
- .execute();
-
- }
-
- assertThat(otherMessages, emptyIterable());
- }
-
- private void assertManagedResources(final BiConsumer assertor, final IoTProject project, final String addressSpaceName) {
- assertObject(assertor, "Address space", this.addressSpaceClient, addressSpaceName);
- assertObject(assertor, "Adapter user", this.userClient, addressSpaceName + ".adapter-" + project.getMetadata().getUid());
- for ( final String address : IOT_ADDRESSES) {
- var addressName = address + "/" + IOT_PROJECT_NAMESPACE + "." + project.getMetadata().getName();
- var metaName = KubeUtil.sanitizeForGo(addressSpaceName, addressName);
- assertObject(assertor, "Address: " + addressName + " / " + metaName, this.addressClient, metaName);
- }
- }
-
- private static void assertObject(final BiConsumer assertor, final String message, final MixedOperation client, final String name) {
- var object = client.withName(name).get();
- assertor.accept(object, message);
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/DeviceRegistryTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/DeviceRegistryTest.java
deleted file mode 100644
index fd709d39543..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/DeviceRegistryTest.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright 2019, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.iot.isolated.registry;
-
-import static io.enmasse.systemtest.TestTag.SMOKE;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.HTTP;
-import static java.net.HttpURLConnection.HTTP_CONFLICT;
-import static java.net.HttpURLConnection.HTTP_CREATED;
-import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import java.net.HttpURLConnection;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-import org.eclipse.hono.service.management.credentials.CommonCredential;
-import org.eclipse.hono.service.management.credentials.PasswordCredential;
-import org.eclipse.hono.service.management.device.Device;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.iot.model.v1.IoTConfigBuilder;
-import io.enmasse.iot.model.v1.IoTProject;
-import io.enmasse.systemtest.Endpoint;
-import io.enmasse.systemtest.UserCredentials;
-import io.enmasse.systemtest.amqp.AmqpClient;
-import io.enmasse.systemtest.amqp.AmqpClientFactory;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.iot.ITestIoTIsolated;
-import io.enmasse.systemtest.iot.CredentialsRegistryClient;
-import io.enmasse.systemtest.iot.DeviceRegistryClient;
-import io.enmasse.systemtest.iot.IoTTestSession.Adapter;
-import io.enmasse.systemtest.utils.IoTUtils;
-
-@Tag(SMOKE)
-abstract class DeviceRegistryTest extends TestBase implements ITestIoTIsolated {
-
- private static final String DEVICE_REGISTRY_TEST_ADDRESSSPACE = "device-registry-test-addrspace";
-
- private static final String DEVICE_REGISTRY_TEST_PROJECT = "device-registry-test-project";
-
- private String randomDeviceId;
- private IoTProject iotProject;
- private Endpoint deviceRegistryEndpoint;
- private Endpoint httpAdapterEndpoint;
- private DeviceRegistryClient client;
-
- private UserCredentials credentials;
-
- private AmqpClientFactory iotAmqpClientFactory;
-
- private AmqpClient amqpClient;
-
- protected abstract IoTConfigBuilder provideIoTConfig() throws Exception;
-
- protected int tenantDoesNotExistCode() {
- return HttpURLConnection.HTTP_UNAUTHORIZED;
- }
-
- @BeforeEach
- public void setAttributes() throws Exception {
- var iotConfigBuilder = provideIoTConfig();
-
- // disable all but HTTP
-
- for (Adapter adapter : Adapter.values()) {
- iotConfigBuilder = adapter.disable(iotConfigBuilder);
- }
- iotConfigBuilder = HTTP.enable(iotConfigBuilder);
-
- // build config
-
- var iotConfig = iotConfigBuilder.build();
-
- isolatedIoTManager.createIoTConfig(iotConfig);
-
- iotProject = IoTUtils.getBasicIoTProjectObject(DEVICE_REGISTRY_TEST_PROJECT,
- DEVICE_REGISTRY_TEST_ADDRESSSPACE, IOT_PROJECT_NAMESPACE, getDefaultAddressSpacePlan());
- isolatedIoTManager.createIoTProject(iotProject);
-
- deviceRegistryEndpoint = IoTUtils.getDeviceRegistryManagementEndpoint();
-
- httpAdapterEndpoint = kubernetes.getExternalEndpoint("iot-http-adapter");
-
- client = new DeviceRegistryClient(deviceRegistryEndpoint);
-
- this.randomDeviceId = UUID.randomUUID().toString();
-
- this.credentials = new UserCredentials(UUID.randomUUID().toString(), UUID.randomUUID().toString());
- isolatedIoTManager.createOrUpdateUser(isolatedIoTManager.getAddressSpace(IOT_PROJECT_NAMESPACE, DEVICE_REGISTRY_TEST_ADDRESSSPACE), this.credentials);
- this.iotAmqpClientFactory = new AmqpClientFactory(resourcesManager.getAddressSpace(IOT_PROJECT_NAMESPACE, DEVICE_REGISTRY_TEST_ADDRESSSPACE), this.credentials);
- this.amqpClient = iotAmqpClientFactory.createQueueClient();
-
- }
-
- protected void doTestRegisterDevice() throws Exception {
- client.registerDevice(isolatedIoTManager.getTenantId(), randomDeviceId);
- final Device result = client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
- assertNotNull(result);
- assertDefaultEnabled(result.isEnabled());
-
- client.deleteDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
- client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId, HTTP_NOT_FOUND);
- }
-
- protected void doTestDisableDevice() throws Exception {
- client.registerDevice(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- final Device payload = new Device();
- payload.setEnabled(false);
-
- client.updateDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId, payload);
-
- final Device result = client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- // as we set it explicitly, we expect the explicit value of "false"
- assertEquals(Boolean.FALSE, result.isEnabled());
-
- client.deleteDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
- client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId, HTTP_NOT_FOUND);
- }
-
- protected void doTestDeviceCredentials() throws Exception {
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
-
- client.registerDevice(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- String authId = "sensor-" + UUID.randomUUID().toString();
- String password = "password1234";
- credentialsClient.addCredentials(isolatedIoTManager.getTenantId(), randomDeviceId, authId, password, null, HttpURLConnection.HTTP_NO_CONTENT);
-
- IoTUtils.checkCredentials(authId, password, false, httpAdapterEndpoint, amqpClient, iotProject);
-
- credentialsClient.deleteAllCredentials(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- client.deleteDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
- client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId, HTTP_NOT_FOUND);
-
- }
- }
-
- protected void doTestDeviceCredentialsPlainPassword() throws Exception {
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
-
- client.registerDevice(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- String authId = "sensor-" + UUID.randomUUID().toString();
- String password = "password1234";
- credentialsClient.addPlainPasswordCredentials(isolatedIoTManager.getTenantId(), randomDeviceId, authId, password, null, HttpURLConnection.HTTP_NO_CONTENT);
-
- IoTUtils.checkCredentials(authId, password, false, httpAdapterEndpoint, amqpClient, iotProject);
-
- credentialsClient.deleteAllCredentials(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- client.deleteDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
- client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId, HTTP_NOT_FOUND);
-
- }
- }
-
- protected void doTestDeviceCredentialsDoesNotContainsPasswordDetails() throws Exception {
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
-
- client.registerDevice(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- String authId = "sensor-" + UUID.randomUUID().toString();
- String password = "password1234";
- credentialsClient.addPlainPasswordCredentials(isolatedIoTManager.getTenantId(), randomDeviceId, authId, password, null, HttpURLConnection.HTTP_NO_CONTENT);
-
- List credentials = credentialsClient.getCredentials(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- assertEquals(1, credentials.size());
- PasswordCredential passwordCredential = ((PasswordCredential) credentials.get(0));
- assertEquals(1, passwordCredential.getSecrets().size());
- assertNull(passwordCredential.getSecrets().get(0).getHashFunction());
- assertNull(passwordCredential.getSecrets().get(0).getPasswordHash());
- assertNull(passwordCredential.getSecrets().get(0).getPasswordPlain());
- assertNull(passwordCredential.getSecrets().get(0).getSalt());
-
- credentialsClient.deleteAllCredentials(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- client.deleteDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
- client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId, HTTP_NOT_FOUND);
-
- }
- }
-
-
- protected void doTestCacheExpiryForCredentials() throws Exception {
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
-
- final Duration cacheExpiration = Duration.ofMinutes(3);
-
- // register device
-
- client.registerDevice(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- final String authId = UUID.randomUUID().toString();
- final String password = "password1234";
- credentialsClient.addCredentials(isolatedIoTManager.getTenantId(), randomDeviceId, authId, password, null, HttpURLConnection.HTTP_NO_CONTENT);
-
- // first test, cache filled
-
- IoTUtils.checkCredentials(authId, password, false, httpAdapterEndpoint, amqpClient, iotProject);
-
- // set new password
-
- final String newPassword = "new-password1234";
- credentialsClient.updateCredentials(isolatedIoTManager.getTenantId(), randomDeviceId, authId, newPassword, null);
-
- // expect failure due to cached info
-
- IoTUtils.checkCredentials(authId, newPassword, true, httpAdapterEndpoint, amqpClient, iotProject);
- LOGGER.info("Waiting {} seconds for credentials to expire", cacheExpiration);
- Thread.sleep(cacheExpiration.toMillis());
-
- // cache must be expired, new password can be used
-
- IoTUtils.checkCredentials(authId, newPassword, false, httpAdapterEndpoint, amqpClient, iotProject);
-
- credentialsClient.deleteAllCredentials(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- client.deleteDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
- client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId, HTTP_NOT_FOUND);
- }
- }
-
-
- protected void doTestSetExpiryForCredentials() throws Exception {
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
- client.registerDevice(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- final String authId = UUID.randomUUID().toString();
- final Duration expiry = Duration.ofSeconds(30);
- final Instant notAfter = Instant.now().plus(expiry);
- final String newPassword = "password1234";
-
- credentialsClient.addCredentials(isolatedIoTManager.getTenantId(), randomDeviceId, authId, newPassword, notAfter, HttpURLConnection.HTTP_NO_CONTENT);
-
- // first check, must succeed
- Thread.sleep(20_000);
- IoTUtils.checkCredentials(authId, newPassword, false, httpAdapterEndpoint, amqpClient, iotProject);
-
- LOGGER.info("Waiting {} for credentials to expire", expiry);
- Thread.sleep(expiry.toMillis());
-
- // second check, after expiration, must fail
-
- IoTUtils.checkCredentials(authId, newPassword, true, httpAdapterEndpoint, amqpClient, iotProject);
-
- credentialsClient.deleteAllCredentials(isolatedIoTManager.getTenantId(), randomDeviceId);
-
- client.deleteDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId);
- client.getDeviceRegistration(isolatedIoTManager.getTenantId(), randomDeviceId, HTTP_NOT_FOUND);
- }
- }
-
-
- protected void doTestCreateForNonExistingTenantFails() throws Exception {
- var response = client.registerDeviceWithResponse("invalid-" + isolatedIoTManager.getTenantId(), randomDeviceId);
- assertEquals(tenantDoesNotExistCode(), response.statusCode());
- }
-
- protected void doTestTenantDeletionTriggersDevicesDeletion() throws Exception {
- var tenantId = isolatedIoTManager.getTenantId();
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
- client.registerDevice(tenantId, randomDeviceId);
-
- final String authId = UUID.randomUUID().toString();
- final Duration expiry = Duration.ofSeconds(30);
- final Instant notAfter = Instant.now().plus(expiry);
- final String newPassword = "password1234";
-
- credentialsClient.addCredentials(tenantId, randomDeviceId, authId, newPassword, notAfter, HttpURLConnection.HTTP_NO_CONTENT);
-
- // first check, must succeed
-
- IoTUtils.checkCredentials(authId, newPassword, false, httpAdapterEndpoint, amqpClient, iotProject);
-
- // Now delete the tenant
- isolatedIoTManager.deleteIoTProject(iotProject);
-
- // second check, the credentials and device should be deleted
-
- client.getDeviceRegistration(tenantId, randomDeviceId, tenantDoesNotExistCode());
- IoTUtils.checkCredentials(authId, newPassword, true, httpAdapterEndpoint, amqpClient, iotProject);
- }
- }
-
- protected void doCreateDuplicateDeviceFails() throws Exception {
- var tenantId = isolatedIoTManager.getTenantId();
- var deviceId = UUID.randomUUID().toString();
-
- // create device
-
- var response = client.registerDeviceWithResponse(tenantId, deviceId);
- assertEquals(HTTP_CREATED, response.statusCode());
-
- // create device a second time
-
- var response2 = client.registerDeviceWithResponse(tenantId, deviceId);
- assertEquals(HTTP_CONFLICT, response2.statusCode());
- }
-
- @Test
- public void testDeviceWithSameAuthIdOfDifferentTypesSucceeds() throws Exception {
-
- var tenantId = isolatedIoTManager.getTenantId();
- var deviceId = UUID.randomUUID().toString();
-
- // create device
-
- client.registerDevice(tenantId, deviceId);
-
- var authId = UUID.randomUUID().toString();
-
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
- credentialsClient.addPlainPasswordCredentials(tenantId, deviceId, authId, "foo-bar", null, HttpURLConnection.HTTP_NO_CONTENT);
- credentialsClient.addPskCredentials(tenantId, deviceId, authId, "foo-bar".getBytes(StandardCharsets.UTF_8), null, HttpURLConnection.HTTP_NO_CONTENT);
- }
-
- }
-
- @Test
- public void testDeviceWithSameAuthIdOfSameTypesFails() throws Exception {
-
- var tenantId = isolatedIoTManager.getTenantId();
- var deviceId1 = UUID.randomUUID().toString();
- var deviceId2 = UUID.randomUUID().toString();
-
- // create device
-
- client.registerDevice(tenantId, deviceId1);
- client.registerDevice(tenantId, deviceId2);
-
- var authId = UUID.randomUUID().toString();
-
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
- // must succeed
- credentialsClient.addPlainPasswordCredentials(tenantId, deviceId1, authId, "foo-bar", null, HttpURLConnection.HTTP_NO_CONTENT);
- // must fail
- credentialsClient.addPlainPasswordCredentials(tenantId, deviceId2, authId, "foo-bar", null, HttpURLConnection.HTTP_BAD_REQUEST);
- }
-
- }
-
- protected void doRegisterMultipleDevices() throws Exception {
-
- final String tenantId = isolatedIoTManager.getTenantId();
- final String prefix = UUID.randomUUID().toString();
- final Set devices = new HashSet<>();
-
- for (int i = 0; i < 1_000; i++) {
- var deviceId = prefix + "-" + UUID.randomUUID().toString();
- client.registerDevice(tenantId, deviceId);
- devices.add(deviceId);
- }
-
- try (var credentialsClient = new CredentialsRegistryClient(deviceRegistryEndpoint)) {
- for (final String deviceId : devices) {
- credentialsClient.addPlainPasswordCredentials(tenantId, deviceId, UUID.randomUUID().toString(), UUID.randomUUID().toString(), null, HttpURLConnection.HTTP_NO_CONTENT);
- }
- }
-
- for (final String deviceId : devices) {
- final Device result = client.getDeviceRegistration(tenantId, deviceId);
- assertNotNull(result);
- assertDefaultEnabled(result.isEnabled());
- }
-
- for (final String deviceId : devices) {
- client.deleteDeviceRegistration(tenantId, deviceId);
- }
-
- for (final String deviceId : devices) {
- client.getDeviceRegistration(tenantId, deviceId, HTTP_NOT_FOUND);
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/H2DeviceRegistryTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/H2DeviceRegistryTest.java
deleted file mode 100644
index e1552f0288e..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/H2DeviceRegistryTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.registry;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.iot.DefaultDeviceRegistry.newH2Based;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectDeviceConnectionType;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectRegistryType;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-
-import io.enmasse.iot.model.v1.IoTConfigBuilder;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.logs.CustomLogger;
-import io.enmasse.systemtest.platform.Kubernetes;
-import io.enmasse.systemtest.platform.apps.SystemtestsKubernetesApps;
-
-class H2DeviceRegistryTest extends DeviceRegistryTest {
-
- private final Logger log = CustomLogger.getLogger();
-
- @Override
- protected IoTConfigBuilder provideIoTConfig() throws Exception {
- return IoTTestSession
- .createDefaultConfig()
- .editOrNewSpec()
- .withServices(newH2Based())
- .endSpec();
- }
-
- @Test
- void testCorrectTypeDeployed () {
- assertCorrectDeviceConnectionType("jdbc");
- assertCorrectRegistryType("jdbc");
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testRegisterDevice() throws Exception {
- super.doTestRegisterDevice();
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testDisableDevice() throws Exception {
- super.doTestDisableDevice();
- }
-
- @Test
- void testDeviceCredentials() throws Exception {
- super.doTestDeviceCredentials();
- }
-
- @Test
- void testDeviceCredentialsPlainPassword() throws Exception {
- super.doTestDeviceCredentialsPlainPassword();
- }
-
- @Test
- @Disabled("Fixed in hono/pull/1565")
- void testDeviceCredentialsDoesNotContainsPasswordDetails() throws Exception {
- super.doTestDeviceCredentialsDoesNotContainsPasswordDetails();
- }
-
- @Test
- @Disabled("Caches expire a bit unpredictably")
- void testCacheExpiryForCredentials() throws Exception {
- super.doTestCacheExpiryForCredentials();
- }
-
- @Test
- void testSetExpiryForCredentials() throws Exception {
- super.doTestSetExpiryForCredentials();
- }
-
- @Test
- void testCreateForNonExistingTenantFails() throws Exception {
- super.doTestCreateForNonExistingTenantFails();
- }
-
- @Test
- void testCreateDuplicateDeviceFails() throws Exception {
- super.doCreateDuplicateDeviceFails();
- }
-
- @Test
- void testRegisterMultipleDevices() throws Exception {
- super.doRegisterMultipleDevices();
- }
-
- @Test
- void testTenantDeletionTriggersDevicesDeletion() throws Exception {
- super.doTestTenantDeletionTriggersDevicesDeletion();
-
- // dump content, just in case
-
- dumpH2Database();
-
- // ensure that the database is still present, but has zero entries
-
- final List command = new ArrayList<>(Arrays.asList(SystemtestsKubernetesApps.H2_SHELL_COMMAND));
- command.addAll(Arrays.asList("-sql", "select count(*) as NUM from device_registrations"));
-
- var pod = SystemtestsKubernetesApps
- .getH2ServerPod()
- .orElseThrow(() -> new IllegalStateException("Unable to find H2 server pod"));
- final String[] result = Kubernetes.executeWithInput(pod, null, null, Duration.ofSeconds(10),
- command.toArray(String[]::new)
- )
- .split("[\r\n]+");
-
- // must have three lines
- assertEquals(3, result.length);
- // first: the column name
- assertEquals("NUM", result[0]);
- // second: the number of entries, which must be zero
- assertEquals("0", result[1]);
- // third: the execution statistics, which we ignore
-
- }
-
- private void dumpH2Database() throws IOException, InterruptedException, TimeoutException {
- final List command = new ArrayList<>(Arrays.asList(SystemtestsKubernetesApps.H2_SHELL_COMMAND));
- command.addAll(Arrays.asList("-sql", "select * from device_registrations"));
-
- var pod = SystemtestsKubernetesApps
- .getH2ServerPod()
- .orElseThrow(() -> new IllegalStateException("Unable to find H2 server pod"));
- final String result = Kubernetes.executeWithInput(pod, null, null, Duration.ofSeconds(10),
- command.toArray(String[]::new));
-
- log.info("Current H2 database:\n{}", result);
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/InfinispanDeviceRegistryTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/InfinispanDeviceRegistryTest.java
deleted file mode 100644
index c510e7ed00c..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/InfinispanDeviceRegistryTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.registry;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.iot.DefaultDeviceRegistry.newInfinispanBased;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectDeviceConnectionType;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectRegistryType;
-
-import java.net.HttpURLConnection;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.iot.model.v1.IoTConfigBuilder;
-import io.enmasse.systemtest.iot.IoTTestSession;
-
-class InfinispanDeviceRegistryTest extends DeviceRegistryTest {
-
- @Override
- protected int tenantDoesNotExistCode() {
- return HttpURLConnection.HTTP_UNAUTHORIZED;
- }
-
- @Override
- protected IoTConfigBuilder provideIoTConfig() throws Exception {
- return IoTTestSession
- .createDefaultConfig()
- .editOrNewSpec()
- .withServices(newInfinispanBased())
- .endSpec();
- }
-
- @Test
- void testCorrectTypeDeployed () {
- assertCorrectDeviceConnectionType("infinispan");
- assertCorrectRegistryType("infinispan");
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testRegisterDevice() throws Exception {
- super.doTestRegisterDevice();
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testDisableDevice() throws Exception {
- super.doTestDisableDevice();
- }
-
- @Test
- void testDeviceCredentials() throws Exception {
- super.doTestDeviceCredentials();
- }
-
- @Test
- void testDeviceCredentialsPlainPassword() throws Exception {
- super.doTestDeviceCredentialsPlainPassword();
- }
-
- @Test
- @Disabled("Fixed in hono/pull/1565")
- void testDeviceCredentialsDoesNotContainsPasswordDetails() throws Exception {
- super.doTestDeviceCredentialsDoesNotContainsPasswordDetails();
- }
-
- @Test
- @Disabled("Caches expire a bit unpredictably")
- void testCacheExpiryForCredentials() throws Exception {
- super.doTestCacheExpiryForCredentials();
- }
-
- @Test
- void testSetExpiryForCredentials() throws Exception {
- super.doTestSetExpiryForCredentials();
- }
-
- @Test
- void testCreateForNonExistingTenantFails() throws Exception {
- super.doTestCreateForNonExistingTenantFails();
- }
-
- @Test
- void testCreateDuplicateDeviceFails() throws Exception {
- super.doCreateDuplicateDeviceFails();
- }
-
- @Test
- void testRegisterMultipleDevices() throws Exception {
- super.doRegisterMultipleDevices();
- }
-
- @Test
- void testTenantDeletionTriggersDevicesDeletion() throws Exception {
- super.doTestTenantDeletionTriggersDevicesDeletion();
- }
-
- @Override
- @Disabled("Not supported by Infinispan")
- public void testDeviceWithSameAuthIdOfSameTypesFails() throws Exception {
- super.testDeviceWithSameAuthIdOfSameTypesFails();
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/MixedDeviceRegistryTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/MixedDeviceRegistryTest.java
deleted file mode 100644
index a69acad66cf..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/MixedDeviceRegistryTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.registry;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.iot.DefaultDeviceRegistry.newPostgresBasedRegistry;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectDeviceConnectionType;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectRegistryType;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.iot.model.v1.IoTConfigBuilder;
-import io.enmasse.systemtest.iot.DefaultDeviceRegistry;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.platform.apps.SystemtestsKubernetesApps;
-
-class MixedDeviceRegistryTest extends DeviceRegistryTest {
-
- @Override
- protected IoTConfigBuilder provideIoTConfig() throws Exception {
-
- var jdbcEndpoint = SystemtestsKubernetesApps.deployPostgresqlServer();
- var infinispanEndpoint = SystemtestsKubernetesApps.deployInfinispanServer();
-
- return IoTTestSession
- .createDefaultConfig()
- .editOrNewSpec()
- .withNewServices()
- .withDeviceConnection(DefaultDeviceRegistry.newInfinispanDeviceConnectionService(infinispanEndpoint))
- .withDeviceRegistry(newPostgresBasedRegistry(jdbcEndpoint, false))
- .endServices()
- .endSpec();
-
- }
-
- @Test
- void testCorrectTypeDeployed () {
- assertCorrectDeviceConnectionType("infinispan");
- assertCorrectRegistryType("jdbc");
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testRegisterDevice() throws Exception {
- super.doTestRegisterDevice();
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testDisableDevice() throws Exception {
- super.doTestDisableDevice();
- }
-
- @Test
- void testDeviceCredentials() throws Exception {
- super.doTestDeviceCredentials();
- }
-
- @Test
- void testDeviceCredentialsPlainPassword() throws Exception {
- super.doTestDeviceCredentialsPlainPassword();
- }
-
- @Test
- @Disabled("Fixed in hono/pull/1565")
- void testDeviceCredentialsDoesNotContainsPasswordDetails() throws Exception {
- super.doTestDeviceCredentialsDoesNotContainsPasswordDetails();
- }
-
- @Test
- @Disabled("Caches expire a bit unpredictably")
- void testCacheExpiryForCredentials() throws Exception {
- super.doTestCacheExpiryForCredentials();
- }
-
- @Test
- void testSetExpiryForCredentials() throws Exception {
- super.doTestSetExpiryForCredentials();
- }
-
- @Test
- void testCreateForNonExistingTenantFails() throws Exception {
- super.doTestCreateForNonExistingTenantFails();
- }
-
- @Test
- void testCreateDuplicateDeviceFails() throws Exception {
- super.doCreateDuplicateDeviceFails();
- }
-
- @Test
- void testRegisterMultipleDevices() throws Exception {
- super.doRegisterMultipleDevices();
- }
-
- @Test
- void testTenantDeletionTriggersDevicesDeletion() throws Exception {
- super.doTestTenantDeletionTriggersDevicesDeletion();
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/PostgresTableDeviceRegistryTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/PostgresTableDeviceRegistryTest.java
deleted file mode 100644
index f0491ad3aef..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/PostgresTableDeviceRegistryTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.registry;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.iot.DefaultDeviceRegistry.newPostgresBased;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectDeviceConnectionType;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectRegistryType;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.iot.model.v1.IoTConfigBuilder;
-import io.enmasse.systemtest.iot.IoTTestSession;
-
-class PostgresTableDeviceRegistryTest extends DeviceRegistryTest {
-
- @Override
- protected IoTConfigBuilder provideIoTConfig() throws Exception {
- return IoTTestSession
- .createDefaultConfig()
- .editOrNewSpec()
- .withServices(newPostgresBased(false))
- .endSpec();
- }
-
- @Test
- void testCorrectTypeDeployed () {
- assertCorrectDeviceConnectionType("jdbc");
- assertCorrectRegistryType("jdbc");
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testRegisterDevice() throws Exception {
- super.doTestRegisterDevice();
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testDisableDevice() throws Exception {
- super.doTestDisableDevice();
- }
-
- @Test
- void testDeviceCredentials() throws Exception {
- super.doTestDeviceCredentials();
- }
-
- @Test
- void testDeviceCredentialsPlainPassword() throws Exception {
- super.doTestDeviceCredentialsPlainPassword();
- }
-
- @Test
- @Disabled("Fixed in hono/pull/1565")
- void testDeviceCredentialsDoesNotContainsPasswordDetails() throws Exception {
- super.doTestDeviceCredentialsDoesNotContainsPasswordDetails();
- }
-
- @Test
- @Disabled("Caches expire a bit unpredictably")
- void testCacheExpiryForCredentials() throws Exception {
- super.doTestCacheExpiryForCredentials();
- }
-
- @Test
- void testSetExpiryForCredentials() throws Exception {
- super.doTestSetExpiryForCredentials();
- }
-
- @Test
- void testCreateForNonExistingTenantFails() throws Exception {
- super.doTestCreateForNonExistingTenantFails();
- }
-
- @Test
- void testCreateDuplicateDeviceFails() throws Exception {
- super.doCreateDuplicateDeviceFails();
- }
-
- @Test
- void testRegisterMultipleDevices() throws Exception {
- super.doRegisterMultipleDevices();
- }
-
- @Test
- void testTenantDeletionTriggersDevicesDeletion() throws Exception {
- super.doTestTenantDeletionTriggersDevicesDeletion();
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/PostgresTableSplitDeviceRegistryTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/PostgresTableSplitDeviceRegistryTest.java
deleted file mode 100644
index 307a9a085e9..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/registry/PostgresTableSplitDeviceRegistryTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2019-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.registry;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.iot.DefaultDeviceRegistry.newPostgresBased;
-import static io.enmasse.systemtest.utils.IoTUtils.assertCorrectRegistryType;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.iot.model.v1.IoTConfigBuilder;
-import io.enmasse.systemtest.iot.IoTTestSession;
-
-/**
- * Postgres table model, split adapter and management pods.
- */
-class PostgresTableSplitDeviceRegistryTest extends DeviceRegistryTest {
-
- @Override
- protected IoTConfigBuilder provideIoTConfig() throws Exception {
- return IoTTestSession
- .createDefaultConfig()
- .editOrNewSpec()
- .withServices(newPostgresBased(true))
- .endSpec();
- }
-
- @Test
- void testCorrectTypeDeployed () {
- assertCorrectRegistryType("jdbc");
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testRegisterDevice() throws Exception {
- super.doTestRegisterDevice();
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testDisableDevice() throws Exception {
- super.doTestDisableDevice();
- }
-
- @Test
- void testDeviceCredentials() throws Exception {
- super.doTestDeviceCredentials();
- }
-
- @Test
- void testDeviceCredentialsPlainPassword() throws Exception {
- super.doTestDeviceCredentialsPlainPassword();
- }
-
- @Test
- @Disabled("Fixed in hono/pull/1565")
- void testDeviceCredentialsDoesNotContainsPasswordDetails() throws Exception {
- super.doTestDeviceCredentialsDoesNotContainsPasswordDetails();
- }
-
- @Test
- @Disabled("Caches expire a bit unpredictably")
- void testCacheExpiryForCredentials() throws Exception {
- super.doTestCacheExpiryForCredentials();
- }
-
- @Test
- void testSetExpiryForCredentials() throws Exception {
- super.doTestSetExpiryForCredentials();
- }
-
- @Test
- void testCreateForNonExistingTenantFails() throws Exception {
- super.doTestCreateForNonExistingTenantFails();
- }
-
- @Test
- void testCreateDuplicateDeviceFails() throws Exception {
- super.doCreateDuplicateDeviceFails();
- }
-
- @Test
- void testRegisterMultipleDevices() throws Exception {
- super.doRegisterMultipleDevices();
- }
-
- @Test
- void testTenantDeletionTriggersDevicesDeletion() throws Exception {
- super.doTestTenantDeletionTriggersDevicesDeletion();
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/tls/ReloadCertificatesTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/tls/ReloadCertificatesTest.java
deleted file mode 100644
index 0e06318f3f9..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/tls/ReloadCertificatesTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.tls;
-
-import static io.enmasse.systemtest.TestTag.ISOLATED;
-import static io.enmasse.systemtest.condition.OpenShiftVersion.OCP4;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.HTTP;
-import static io.enmasse.systemtest.time.TimeoutBudget.ofDuration;
-import static java.time.Duration.ofMinutes;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.time.Duration;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.iot.ITestIoTIsolated;
-import io.enmasse.systemtest.condition.OpenShift;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.IoTTestSession.Device;
-import io.enmasse.systemtest.iot.MessageSendTester;
-import io.enmasse.systemtest.iot.MessageSendTester.ConsumerFactory;
-import io.enmasse.systemtest.platform.Kubernetes;
-import io.enmasse.systemtest.time.TimeoutBudget;
-import io.enmasse.systemtest.utils.IoTUtils;
-import io.enmasse.systemtest.utils.TestUtils;
-import io.fabric8.kubernetes.client.KubernetesClient;
-
-@Tag(ISOLATED)
-public class ReloadCertificatesTest extends TestBase implements ITestIoTIsolated {
-
- private static final String NAMESPACE = Kubernetes.getInstance().getInfraNamespace();
-
- private KubernetesClient client = Kubernetes.getInstance().getClient();
-
- @Test
- @OpenShift(version = OCP4)
- public void testRecreateCertificate() throws Exception {
-
- IoTTestSession
- .createDefault()
- .adapters(HTTP)
- .config(config -> {
- // ensure we are using the service-ca
- config.editOrNewSpec()
- .withNewInterServiceCertificates()
- .withNewServiceCAStrategy()
- .endServiceCAStrategy()
- .endInterServiceCertificates()
-
- .editOrNewAdapters()
- .editOrNewHttp()
- // reset to use service CA endpoint secret
- .withNewEndpoint().endEndpoint()
- .endHttp()
- .endAdapters()
-
- .endSpec();
- })
- .run((session) -> {
-
- var deviceId = UUID.randomUUID().toString();
- var authId = UUID.randomUUID().toString();
- var password = UUID.randomUUID().toString();
- var device = session.newDevice(deviceId)
- .register()
- .setPassword(authId, password);
-
- // ensure everything works before starting
-
- assertTelemetryWorks(session, device);
-
- // get current pod
-
- var deploymentAccess = this.client
- .apps().deployments()
- .inNamespace(NAMESPACE)
- .withName("iot-http-adapter");
-
- var pod = this.client
- .pods()
- .inNamespace(NAMESPACE).withLabels(Map.of(
- "app", "enmasse",
- "name", "iot-http-adapter"))
- .list().getItems().stream()
- .map(p -> p.getMetadata().getName())
- .findFirst()
- .orElse(null);
-
- assertNotNull(pod);
-
- // then: reset http adapter key/cert
-
- var deleteResult = this.client.secrets()
- .inNamespace(NAMESPACE)
- .withName("iot-http-adapter-tls")
- .delete();
-
- assertEquals(Boolean.TRUE, deleteResult);
-
- final TimeoutBudget budget = ofDuration(ofMinutes(10));
-
- // wait until the deployment has changed
-
- var initialVersion = deploymentAccess.get().getMetadata().getResourceVersion();
- TestUtils.waitForChangedResourceVersion(budget, initialVersion, () -> {
- return Optional.ofNullable(deploymentAccess.get())
- .map(d -> d.getMetadata().getResourceVersion())
- .orElse(initialVersion);
- });
-
- // and wait until the IoTConfig is ready again
-
- IoTUtils.waitForIoTConfigReady(Kubernetes.getInstance(), session.getConfig());
-
- // now try to send messages again
-
- assertTelemetryWorks(session, device);
-
- });
-
- }
-
- protected void assertTelemetryWorks(final IoTTestSession session, final Device device) throws Exception {
- try (var adapterClient = device.createHttpAdapterClient()) {
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .delay(Duration.ofMillis(500))
- .consumerFactory(ConsumerFactory.of(session.getConsumerClient(), session.getTenantId()))
- .sender(adapterClient::send)
- .amount(30)
- .consume(MessageSendTester.Consume.BEFORE)
- .execute();
- }
-
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/tls/TlsVersionTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/tls/TlsVersionTest.java
deleted file mode 100644
index e75bf753189..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/tls/TlsVersionTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.tls;
-
-import static io.enmasse.systemtest.TestTag.ISOLATED;
-import static java.util.Collections.singleton;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.time.Duration;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import io.enmasse.systemtest.condition.OpenShift;
-import io.enmasse.systemtest.condition.OpenShiftVersion;
-import io.enmasse.systemtest.iot.HttpAdapterClient;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.IoTTestSession.Adapter;
-import io.enmasse.systemtest.iot.MessageSendTester;
-import io.enmasse.systemtest.iot.MessageSendTester.ConsumerFactory;
-
-@Tag(ISOLATED)
-public class TlsVersionTest {
-
- @OpenShift(version = OpenShiftVersion.OCP4)
- @Test
- public void testWithExplicitVersion() throws Exception {
- IoTTestSession
- .createDefault()
- .adapters(Adapter.HTTP)
- .config(config -> config
- .editOrNewSpec()
- .editOrNewTls()
- .withVersions("TLSv1.3")
- .endTls()
- .endSpec())
- .run(session -> {
-
- var device = session.registerNewRandomDeviceWithPassword();
-
- try (HttpAdapterClient client = device.createHttpAdapterClient(singleton("TLSv1.3"))) {
-
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .delay(Duration.ofSeconds(1))
- .consumerFactory(ConsumerFactory.of(session.getConsumerClient(), session.getTenantId()))
- .sender(client::send)
- .amount(50)
- .consume(MessageSendTester.Consume.BEFORE)
- .execute();
-
- }
-
- try (HttpAdapterClient client = device.createHttpAdapterClient(singleton("TLSv1.2"))) {
-
- // this must fail, as we offer TLSv1.2, but have only 1.3 configured
- assertThrows(TimeoutException.class, () -> {
- new MessageSendTester()
- .type(MessageSendTester.Type.TELEMETRY)
- .delay(Duration.ofSeconds(1))
- .consumerFactory(ConsumerFactory.of(session.getConsumerClient(), session.getTenantId()))
- .sender(client::send)
- .amount(50)
- .consume(MessageSendTester.Consume.BEFORE)
- .execute();
- });
-
- }
-
- });
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/StandardX509Cases.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/StandardX509Cases.java
deleted file mode 100644
index 0afb7cdc95e..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/StandardX509Cases.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.x509;
-
-import static io.enmasse.systemtest.iot.DeviceSupplier.named;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import javax.security.auth.x500.X500Principal;
-
-import io.enmasse.systemtest.iot.DeviceCertificateManager;
-import io.enmasse.systemtest.iot.DeviceCertificateManager.Mode;
-import io.enmasse.systemtest.iot.DeviceSupplier;
-import io.enmasse.systemtest.iot.StandardIoTTests;
-
-public interface StandardX509Cases extends StandardIoTTests {
-
- DeviceCertificateManager getCertificateManager();
-
- @Override
- default List getDevices() {
-
- return Arrays.asList(
- named("default", () -> getSession().newDevice()
- .register()
- .enableX509(getCertificateManager().createDevice())));
-
- }
-
- @Override
- default List getInvalidDevices() {
-
- return Arrays.asList(
- notOurCaDevice(),
- expiredCertificate(),
- futureCertificate());
-
- }
-
- /**
- * Create a device which has a certificate signed by a CA with the same name, but which actually is
- * not the same CA.
- */
- default DeviceSupplier notOurCaDevice() {
-
- return named("notOurCa", () -> {
- var otherMgr = new DeviceCertificateManager(Mode.RSA, new X500Principal("OU=Tenant 1,OU=IoT,O=EnMasse,C=IO"));
-
- return getSession().newDevice()
- .register()
- .enableX509(otherMgr.createDevice());
- });
-
- }
-
- /**
- * Create a device which has an expired certificate.
- */
- default DeviceSupplier expiredCertificate() {
-
- final Instant now = Instant.now();
-
- return named("expiredCertificate", () -> getSession().newDevice()
- .register()
- .enableX509(getCertificateManager()
- .createDevice(
- UUID.randomUUID().toString(),
- now.minus(Duration.ofDays(30)),
- now)));
-
- }
-
- /**
- * Create a device which has an valid date in the future.
- */
- default DeviceSupplier futureCertificate() {
-
- final Instant now = Instant.now();
-
- return named("futureCertificate", () -> getSession().newDevice()
- .register()
- .enableX509(getCertificateManager()
- .createDevice(
- UUID.randomUUID().toString(),
- now.plus(Duration.ofDays(100)),
- now.plus(Duration.ofDays(200)))));
-
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/TrustAnchorTests.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/TrustAnchorTests.java
deleted file mode 100644
index 4d287b288b3..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/TrustAnchorTests.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.x509;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static io.enmasse.systemtest.TestTag.ISOLATED_IOT;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.HTTP;
-import static io.enmasse.systemtest.utils.TestUtils.toPem;
-
-import java.time.Duration;
-import java.util.Optional;
-import java.util.UUID;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.enmasse.iot.model.v1.IoTProject;
-import io.enmasse.iot.model.v1.IoTProjectBuilder;
-import io.enmasse.iot.model.v1.IoTProjectStatus;
-import io.enmasse.iot.model.v1.ProjectConditionType;
-import io.enmasse.systemtest.iot.DeviceCertificateManager;
-import io.enmasse.systemtest.iot.DeviceCertificateManager.Mode;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.IoTTests;
-import io.enmasse.systemtest.model.addressspace.AddressSpacePlans;
-import io.enmasse.systemtest.platform.Kubernetes;
-import io.enmasse.systemtest.utils.IoTUtils;
-import io.enmasse.systemtest.utils.TestUtils;
-
-@Tag(ISOLATED_IOT)
-public class TrustAnchorTests implements IoTTests {
-
- private static final Logger log = LoggerFactory.getLogger(TrustAnchorTests.class);
-
- /**
- * Test creating duplicate "subject dn".
- */
- @Test
- @Tag(ACCEPTANCE)
- public void testDuplicateSubjectDn() throws Exception {
- var mgr1 = new DeviceCertificateManager(Mode.RSA, new X500Principal("OU=Tenant 1,OU=IoT,O=EnMasse,C=IO"));
- var mgr2 = new DeviceCertificateManager(Mode.RSA, new X500Principal("OU=Tenant 1,OU=IoT,O=EnMasse,C=IO"));
-
- final String name2 = UUID.randomUUID().toString();
- final String ns2 = UUID.randomUUID().toString();
- Kubernetes.getInstance().createNamespace(ns2);
-
- try (IoTTestSession session = IoTTestSession.createDefault()
- .project(project -> project.editOrNewSpec()
- .editOrNewConfiguration()
- .addNewTrustAnchor()
- .withCertificate(toPem(mgr1.getCertificate()))
- .endTrustAnchor()
- .endConfiguration()
- .endSpec())
- .adapters(HTTP)
- .deploy()) {
-
- // now create a second project, in second namespace, with a new CA
- // having the same name. This must fail.
-
- var project2 = new IoTProjectBuilder(IoTUtils.getBasicIoTProjectObject(
- name2, name2, ns2,
- AddressSpacePlans.STANDARD_SMALL))
-
- .editOrNewSpec()
- .editOrNewConfiguration()
- .addNewTrustAnchor()
- .withCertificate(toPem(mgr2.getCertificate()))
- .endTrustAnchor()
- .endConfiguration()
- .endSpec()
-
- .build();
-
- // create
-
- var projectClient = Kubernetes.getInstance().getIoTProjectClient(ns2);
- session.addCleanup(() -> IoTUtils.deleteIoTProjectAndWait(project2));
- projectClient.create(project2);
- var projectAccess = projectClient.withName(name2);
-
- // and wait for the condition
-
- TestUtils.waitUntilConditionOrFail(() -> {
-
- // wait until the condition 'TrustAnchorsUnique' becomes false
- return Optional
- .ofNullable(projectAccess.get())
- .map(IoTProject::getStatus)
- .map(IoTProjectStatus::getConditions)
- .flatMap(c -> c.stream()
- .filter(condition -> condition.getType() == ProjectConditionType.TRUST_ANCHORS_UNIQUE)
- .findAny())
- .map(c -> "false".equalsIgnoreCase(c.getStatus()) &&
- "DuplicateTrustAnchors".equals(c.getReason()))
- .orElse(false);
-
- }, Duration.ofMinutes(5), Duration.ofSeconds(10), () -> "Conditions 'TrustAnchorsUnique' should become 'false'");
-
- log.info("Successfully detected 'DuplicateTrustAnchors' problem on second project");
-
- }
-
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/X509EcAuthenticationTests.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/X509EcAuthenticationTests.java
deleted file mode 100644
index bdfa0237ceb..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/X509EcAuthenticationTests.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.x509;
-
-import static io.enmasse.systemtest.TestTag.ISOLATED_IOT;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.HTTP;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.MQTT;
-import static io.enmasse.systemtest.utils.TestUtils.toPem;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
-
-import io.enmasse.systemtest.iot.DeviceCertificateManager;
-import io.enmasse.systemtest.iot.DeviceCertificateManager.Mode;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.http.StandardIoTHttpTests;
-import io.enmasse.systemtest.iot.mqtt.StandardIoTMqttTests;
-
-@Tag(ISOLATED_IOT)
-public class X509EcAuthenticationTests implements StandardX509Cases, StandardIoTHttpTests, StandardIoTMqttTests {
-
- private static DeviceCertificateManager certificateManager;
- private static IoTTestSession session;
-
- @BeforeAll
- public static void setup() throws Exception {
-
- certificateManager = new DeviceCertificateManager(Mode.EC, new X500Principal("OU=Tenant 1,OU=IoT,O=EnMasse,C=IO"));
-
- session = IoTTestSession.createDefault()
- .project(project -> project.editOrNewSpec()
- .editOrNewConfiguration()
- .addNewTrustAnchor()
- .withCertificate(toPem(certificateManager.getCertificate()))
- .endTrustAnchor()
- .endConfiguration()
- .endSpec())
- .adapters(MQTT, HTTP)
- .deploy();
-
- }
-
- @AfterAll
- public static void cleanup() throws Exception {
- if (session != null) {
- session.close();
- session = null;
- }
- }
-
- @Override
- public DeviceCertificateManager getCertificateManager() {
- return certificateManager;
- }
-
- @Override
- public IoTTestSession getSession() {
- return session;
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/X509RsaAuthenticationTests.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/X509RsaAuthenticationTests.java
deleted file mode 100644
index 7b3540767c1..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/x509/X509RsaAuthenticationTests.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.isolated.x509;
-
-import static io.enmasse.systemtest.TestTag.ISOLATED_IOT;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.HTTP;
-import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.MQTT;
-import static io.enmasse.systemtest.utils.TestUtils.toPem;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
-
-import io.enmasse.systemtest.iot.DeviceCertificateManager;
-import io.enmasse.systemtest.iot.DeviceCertificateManager.Mode;
-import io.enmasse.systemtest.iot.IoTTestSession;
-import io.enmasse.systemtest.iot.http.StandardIoTHttpTests;
-import io.enmasse.systemtest.iot.mqtt.StandardIoTMqttTests;
-
-@Tag(ISOLATED_IOT)
-public class X509RsaAuthenticationTests implements StandardX509Cases, StandardIoTHttpTests, StandardIoTMqttTests {
-
- private static DeviceCertificateManager certificateManager;
- private static IoTTestSession session;
-
- @BeforeAll
- public static void setup() throws Exception {
-
- certificateManager = new DeviceCertificateManager(Mode.RSA, new X500Principal("OU=Tenant 1,OU=IoT,O=EnMasse,C=IO"));
-
- session = IoTTestSession.createDefault()
- .project(project -> project.editOrNewSpec()
- .editOrNewConfiguration()
- .addNewTrustAnchor()
- .withCertificate(toPem(certificateManager.getCertificate()))
- .endTrustAnchor()
- .endConfiguration()
- .endSpec())
- .adapters(MQTT, HTTP)
- .deploy();
-
- }
-
- @AfterAll
- public static void cleanup() throws Exception {
- if (session != null) {
- session.close();
- session = null;
- }
- }
-
- @Override
- public DeviceCertificateManager getCertificateManager() {
- return certificateManager;
- }
-
- @Override
- public IoTTestSession getSession() {
- return session;
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/mqtt/StandardIoTMqttTests.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/mqtt/StandardIoTMqttTests.java
deleted file mode 100644
index dcf43f5bba6..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/iot/mqtt/StandardIoTMqttTests.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright 2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-
-package io.enmasse.systemtest.iot.mqtt;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.time.Duration;
-import java.util.concurrent.TimeoutException;
-
-import javax.net.ssl.SSLHandshakeException;
-
-import org.eclipse.paho.client.mqttv3.MqttSecurityException;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Throwables;
-
-import io.enmasse.systemtest.iot.DeviceSupplier;
-import io.enmasse.systemtest.iot.MessageSendTester;
-import io.enmasse.systemtest.iot.MessageSendTester.ConsumerFactory;
-import io.enmasse.systemtest.iot.MqttAdapterClient;
-import io.enmasse.systemtest.iot.StandardIoTTests;
-
-/**
- * Standard MQTT IoT tests
- *
- * Note: we do not test single telemetry with QoS 0 here, as we don't receive any
- * feedback if the message was accepted or not. So we couldn't re-try and could only assume that a
- * message loss of 100% would be acceptable, which doesn't test much. For bigger batch sizes we can
- * test with an acceptable message loss rate of e.g. 10%.
- */
-public interface StandardIoTMqttTests extends StandardIoTTests {
-
- final static Logger log = LoggerFactory.getLogger(StandardIoTMqttTests.class);
-
- /**
- * Single telemetry message with attached consumer. QoS 1.
- * >> sentFuture = new AtomicReference<>();
-
- var f1 = setupMessagingReceiver(sentFuture, null);
-
- IoTUtils.waitForFirstSuccess(httpClient, MessageType.TELEMETRY);
-
- var response = sendTelemetryWithTtd();
-
- assertTelemetryResponse(response);
-
- assertCloudTelemetryMessage(f1);
- assertCommandMessageDeliveries(sentFuture.get());
-
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testRequestResponseCommand() throws Exception {
-
- final var reqId = UUID.randomUUID().toString();
- final var replyToAddress = "command_response/" + sharedIoTResourceManager.getTenantId() + "/" + UUID.randomUUID().toString();
-
- final AtomicReference>> sentFuture = new AtomicReference<>();
-
- // set up command response consumer (before responding to telemetry)
- var f3 = sharedIoTResourceManager.getAmqpClient().recvMessages(replyToAddress, 1);
-
- var f1 = setupMessagingReceiver(sentFuture, commandMessage -> {
- commandMessage.setCorrelationId(reqId);
- commandMessage.setReplyTo(replyToAddress);
- });
-
- IoTUtils.waitForFirstSuccess(httpClient, MessageType.TELEMETRY);
-
- var response = sendTelemetryWithTtd();
-
- assertTelemetryResponse(response);
-
- // also assert response id
-
- var responseId = response.getHeader("hono-cmd-req-id");
- assertThat(responseId, notNullValue());
-
- // send the reply to the command
-
- TestUtils.runUntilPass(5, () -> {
- this.httpClient.send(COMMAND_RESPONSE, "/" + responseId,
- new JsonObject().put("data", "command-response").toBuffer(),
- is(HTTP_ACCEPTED),
- request -> request.putHeader("hono-cmd-status", "202" /* accepted */), Duration.ofSeconds(5));
- });
-
- assertCloudTelemetryMessage(f1);
- assertCommandMessageDeliveries(sentFuture.get());
-
- // assert command response message - cloud side
-
- var responses = f3.get(10, TimeUnit.SECONDS);
- assertThat(responses, hasSize(1));
- var responseMsg = responses.get(0);
- assertThat(responseMsg.getCorrelationId(), Is.is(reqId));
- assertThat(responseMsg.getBody(), instanceOf(Data.class));
- assertThat(new JsonObject(Buffer.buffer(((Data) responseMsg.getBody()).getValue().getArray())), Is.is(new JsonObject().put("data", "command-response")));
- assertThat(responseMsg.getApplicationProperties().getValue().get("status"), Is.is(202) /* accepted */);
-
- }
-
- private HttpResponse sendTelemetryWithTtd() throws Exception {
-
- // consumer link should be ready now ... send telemetry with "ttd"
-
- log.info("Send telemetry with TTD - ttd: {}", this.ttd);
-
- var response = TestUtils.runUntilPass(5, () -> {
- return this.httpClient.send(TELEMETRY, null, is(HTTP_OK /* OK for command responses */), request -> {
- // set "time to disconnect"
- request.putHeader("hono-ttd", Integer.toString(this.ttd));
- }, Duration.ofSeconds(this.ttd + 5));
- });
-
- log.info("Telemetry response: {}: {}", response.statusCode(), response.bodyAsString());
-
- return response;
-
- }
-
- private Future> setupMessagingReceiver(final AtomicReference>> sentFuture, final Consumer messageCustomizer) {
-
- // setup telemetry consumer
-
- var f1 = sharedIoTResourceManager.getAmqpClient().recvMessages(new QueueTerminusFactory().getSource("telemetry/" + sharedIoTResourceManager.getTenantId()), msg -> {
-
- log.info("Received message: {}", msg);
-
- var ttdValue = msg.getApplicationProperties().getValue().get("ttd");
-
- if (ttdValue == null) {
- // this was the initial message, without waiting for commands
- return false;
- }
-
- var deviceId = msg.getApplicationProperties().getValue().get("device_id").toString();
-
- // prepare message
-
- var commandMessage = Message.Factory.create();
- commandMessage.setSubject("CMD1");
- commandMessage.setMessageId(UUID.randomUUID().toString());
-
- commandMessage.setContentType("application/octet-stream");
- commandMessage.setBody(new Data(Binary.create(ByteBuffer.wrap(this.commandPayload.getBytes()))));
- commandMessage.setAddress("command/" + sharedIoTResourceManager.getTenantId() + "/" + deviceId);
-
- if (messageCustomizer != null) {
- messageCustomizer.accept(commandMessage);
- }
-
- // send request command
-
- log.info("Sending out command message");
- var f2 = sharedIoTResourceManager.getAmqpClient().sendMessage("command/" + sharedIoTResourceManager.getTenantId(), commandMessage)
- .whenComplete((res, err) -> {
- String strres = null;
- if (res != null) {
- strres = res.stream().map(ProtonDelivery::getRemoteState).map(Object::toString).collect(Collectors.joining(", "));
- }
- log.info("Message result - res: {}, err:", // no need for final {}, as this is an exception
- strres, err);
- });
- sentFuture.set(f2);
- log.info("Message underway");
-
- // stop listening for more messages
-
- return true;
-
- }, Optional.empty()).getResult();
- return f1;
-
- }
-
- private void assertTelemetryResponse(final HttpResponse response) {
-
- // assert message - device side
-
- final var actualCommand = response.bodyAsString();
- assertThat(response.getHeader("hono-command"), Is.is("CMD1"));
- assertThat(actualCommand, Is.is(this.commandPayload));
-
- }
-
- private void assertCloudTelemetryMessage(Future> f1) throws InterruptedException, ExecutionException, TimeoutException {
-
- // assert message - cloud side
-
- // wait for the future of the sent message
- var m1 = f1.get(10, TimeUnit.SECONDS);
-
- // dump messages
- m1.forEach(m -> log.info("Message: {}", m));
-
- // we expect two messages, the "test" message and the actual one
- assertThat(m1, hasSize(2));
- // get the second message, the real one
- var msg = m1.get(1);
-
- // message must have "ttd" set
- var ttdValue = msg.getApplicationProperties().getValue().get("ttd");
- assertThat(ttdValue, instanceOf(Number.class));
- assertThat(ttdValue, Is.is(30));
-
- }
-
- private void assertCommandMessageDeliveries(Future> messageFuture) throws InterruptedException, ExecutionException, TimeoutException {
-
- assertThat(messageFuture, notNullValue());
-
- // assert command message deliveries - cloud side
-
- final List deliveries = messageFuture.get(10, TimeUnit.SECONDS);
- assertThat(deliveries, hasSize(1));
- assertThat(deliveries.stream().map(ProtonDelivery::getRemoteState).collect(Collectors.toList()),
- contains(
- anyOf(
- instanceOf(Released.class), // remove once issue eclipse/hono#1149 is fixed
- instanceOf(Accepted.class))));
-
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/isolated/CommonTest.java b/systemtests/src/test/java/io/enmasse/systemtest/isolated/CommonTest.java
deleted file mode 100644
index 30a07badaf9..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/isolated/CommonTest.java
+++ /dev/null
@@ -1,839 +0,0 @@
-/*
- * Copyright 2018-2020, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.isolated;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import io.enmasse.address.model.Address;
-import io.enmasse.address.model.AddressBuilder;
-import io.enmasse.address.model.AddressSpace;
-import io.enmasse.address.model.AddressSpaceBuilder;
-import io.enmasse.admin.model.v1.AddressPlan;
-import io.enmasse.admin.model.v1.AddressSpacePlan;
-import io.enmasse.admin.model.v1.AddressSpacePlanBuilder;
-import io.enmasse.admin.model.v1.BrokeredInfraConfig;
-import io.enmasse.admin.model.v1.BrokeredInfraConfigBuilder;
-import io.enmasse.admin.model.v1.BrokeredInfraConfigSpecAdminBuilder;
-import io.enmasse.admin.model.v1.BrokeredInfraConfigSpecBrokerBuilder;
-import io.enmasse.admin.model.v1.ResourceAllowance;
-import io.enmasse.admin.model.v1.ResourceRequest;
-import io.enmasse.admin.model.v1.StandardInfraConfig;
-import io.enmasse.admin.model.v1.StandardInfraConfigBuilder;
-import io.enmasse.admin.model.v1.StandardInfraConfigSpecAdminBuilder;
-import io.enmasse.admin.model.v1.StandardInfraConfigSpecBrokerBuilder;
-import io.enmasse.admin.model.v1.StandardInfraConfigSpecRouterBuilder;
-import io.enmasse.config.LabelKeys;
-import io.enmasse.systemtest.UserCredentials;
-import io.enmasse.systemtest.amqp.AmqpClient;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.isolated.ITestBaseIsolated;
-import io.enmasse.systemtest.executor.ExecutionResultData;
-import io.enmasse.systemtest.logs.CustomLogger;
-import io.enmasse.systemtest.model.address.AddressType;
-import io.enmasse.systemtest.model.addressplan.DestinationPlan;
-import io.enmasse.systemtest.model.addressspace.AddressSpacePlans;
-import io.enmasse.systemtest.model.addressspace.AddressSpaceType;
-import io.enmasse.systemtest.platform.KubeCMDClient;
-import io.enmasse.systemtest.platform.Kubernetes;
-import io.enmasse.systemtest.platform.apps.SystemtestsKubernetesApps;
-import io.enmasse.systemtest.shared.standard.QueueTest;
-import io.enmasse.systemtest.time.TimeoutBudget;
-import io.enmasse.systemtest.utils.AddressSpaceUtils;
-import io.enmasse.systemtest.utils.AddressUtils;
-import io.enmasse.systemtest.utils.PlanUtils;
-import io.enmasse.systemtest.utils.TestUtils;
-import io.fabric8.kubernetes.api.model.Pod;
-import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.amqp.messaging.AmqpValue;
-import org.apache.qpid.proton.amqp.messaging.Data;
-import org.apache.qpid.proton.amqp.transport.DeliveryState.DeliveryStateType;
-import org.apache.qpid.proton.message.Message;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.slf4j.Logger;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static io.enmasse.systemtest.TestTag.ISOLATED;
-import static io.enmasse.systemtest.TestTag.NON_PR;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-@Tag(ISOLATED)
-class CommonTest extends TestBase implements ITestBaseIsolated {
- private static Logger log = CustomLogger.getLogger();
-
- @Test
- void testAccessLogs() throws Exception {
- AddressSpace standard = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("mystandard")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.STANDARD.toString())
- .withPlan(AddressSpacePlans.STANDARD_UNLIMITED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- resourcesManager.createAddressSpace(standard);
-
- Address dest = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, "test-queue"))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress("test-queue")
- .withPlan(DestinationPlan.STANDARD_SMALL_QUEUE)
- .endSpec()
- .build();
- resourcesManager.setAddresses(dest);
-
- kubernetes.awaitPodsReady(standard.getMetadata().getNamespace(), new TimeoutBudget(5, TimeUnit.MINUTES));
-
- Multimap podsContainersWithNoLog = HashMultimap.create();
-
- kubernetes.listPods().stream().filter(pod -> !pod.getMetadata().getName().contains("none-authservice")).forEach(pod -> kubernetes.getContainersFromPod(pod.getMetadata().getNamespace(), pod.getMetadata().getName()).forEach(container -> {
- String podNamespace = pod.getMetadata().getNamespace();
- String podName = pod.getMetadata().getName();
- String containerName = container.getName();
- log.info("Getting log from pod: {}, for container: {}", podName, containerName);
- String podlog = kubernetes.getLog(podNamespace, podName, containerName);
-
- // Retry - diagnostic code to help understand a sporadic Ci failure.
- if (podlog.isEmpty()) {
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- log.info("(Retry) Getting log from pod: {}, for container: {}", podName, containerName);
- podlog = kubernetes.getLog(podNamespace, podName, containerName);
- }
-
- if (podlog.isEmpty()) {
- podsContainersWithNoLog.put(podName, containerName);
- }
-
- }));
-
- if (!podsContainersWithNoLog.isEmpty()) {
- String podContainerNames = podsContainersWithNoLog.entries().stream().map(e -> String.format("%s-%s", e.getKey(), e.getValue())).collect(Collectors.joining(","));
- fail(String.format("%d pod container(s) had unexpectedly empty logs : %s ", podsContainersWithNoLog.size(), podContainerNames));
- }
- }
-
- @Test
- void testRestartComponents() throws Exception {
- List labels = new LinkedList<>();
- labels.add(new Label("name", "standard-authservice"));
- labels.add(new Label("name", "address-space-controller"));
- labels.add(new Label("name", "enmasse-operator"));
-
- UserCredentials user = new UserCredentials("frantisek", "dobrota");
- AddressSpace brokered = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("space-restart-brokered")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.BROKERED.toString())
- .withPlan(AddressSpacePlans.BROKERED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- AddressSpace standard = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("space-restart-standard")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.STANDARD.toString())
- .withPlan(AddressSpacePlans.STANDARD_UNLIMITED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- isolatedResourcesManager.createAddressSpaceList(standard, brokered);
- resourcesManager.createOrUpdateUser(brokered, user);
- resourcesManager.createOrUpdateUser(standard, user);
-
- List brokeredAddresses = AddressUtils.getAllBrokeredAddresses(brokered);
- List standardAddresses = AddressUtils.getAllStandardAddresses(standard);
-
- resourcesManager.setAddresses(brokeredAddresses.toArray(new Address[0]));
- resourcesManager.setAddresses(standardAddresses.toArray(new Address[0]));
-
- getClientUtils().assertCanConnect(brokered, user, brokeredAddresses, resourcesManager);
- getClientUtils().assertCanConnect(standard, user, standardAddresses, resourcesManager);
-
- log.info("------------------------------------------------------------");
- log.info("------------------- Start with restarting -------------------");
- log.info("------------------------------------------------------------");
-
- List pods = kubernetes.listPods();
- int runningPodsBefore = pods.size();
- log.info("Number of running pods before restarting any: {}", runningPodsBefore);
- for (Label label : labels) {
- log.info("Restarting {}", label.labelValue);
- KubeCMDClient.deletePodByLabel(label.getLabelName(), label.getLabelValue());
- Thread.sleep(30_000);
- TestUtils.waitForExpectedReadyPods(kubernetes, kubernetes.getInfraNamespace(), runningPodsBefore, new TimeoutBudget(10, TimeUnit.MINUTES));
- assertSystemWorks(brokered, standard, user, brokeredAddresses, standardAddresses);
- }
-
- log.info("Restarting whole enmasse");
- KubeCMDClient.deletePodByLabel("app", kubernetes.getEnmasseAppLabel());
- Thread.sleep(180_000);
- TestUtils.waitForExpectedReadyPods(kubernetes, kubernetes.getInfraNamespace(), runningPodsBefore, new TimeoutBudget(10, TimeUnit.MINUTES));
- AddressUtils.waitForDestinationsReady(new TimeoutBudget(10, TimeUnit.MINUTES),
- standardAddresses.toArray(new Address[0]));
- assertSystemWorks(brokered, standard, user, brokeredAddresses, standardAddresses);
-
- //TODO: Uncomment when #2127 will be fixed
-
-// Pod qdrouter = pods.stream().filter(pod -> pod.getMetadata().getName().contains("qdrouter")).collect(Collectors.toList()).get(0);
-// kubernetes.deletePod(environment.namespace(), qdrouter.getMetadata().getName());
-// assertSystemWorks(brokered, standard, user, brokeredAddresses, standardAddresses);
- }
- //https://github.com/EnMasseProject/enmasse/issues/3098
-
- @Test
- void testRestartAdminComponent() throws Exception {
- List labels = new LinkedList<>();
- labels.add(new Label("name", "admin"));
-
- UserCredentials user = new UserCredentials("frantisek", "dobrota");
- AddressSpace brokered = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("space-restart-brokered")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.BROKERED.toString())
- .withPlan(AddressSpacePlans.BROKERED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- AddressSpace standard = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("space-restart-standard")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.STANDARD.toString())
- .withPlan(AddressSpacePlans.STANDARD_UNLIMITED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- isolatedResourcesManager.createAddressSpaceList(standard, brokered);
- resourcesManager.createOrUpdateUser(brokered, user);
- resourcesManager.createOrUpdateUser(standard, user);
-
- List brokeredAddresses = Collections.singletonList(
- new AddressBuilder()
- .withNewMetadata()
- .withNamespace(brokered.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(brokered, "test-queue"))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress("test-queue")
- .withPlan(DestinationPlan.BROKERED_QUEUE)
- .endSpec()
- .build());
-
- List standardAddresses = Arrays.asList(
- new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, "test-queue"))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress("test-queue")
- .withPlan(DestinationPlan.STANDARD_SMALL_QUEUE)
- .endSpec()
- .build(),
-
- new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, "test-queue-sharded"))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress("test-queue-sharded")
- .withPlan(DestinationPlan.STANDARD_LARGE_QUEUE)
- .endSpec()
- .build());
-
-
- resourcesManager.setAddresses(brokeredAddresses.toArray(new Address[0]));
- resourcesManager.setAddresses(standardAddresses.toArray(new Address[0]));
-
- getClientUtils().assertCanConnect(brokered, user, brokeredAddresses, resourcesManager);
- getClientUtils().assertCanConnect(standard, user, standardAddresses, resourcesManager);
-
- log.info("Sending messages before admin pod restart");
-
- for (Address addr : brokeredAddresses) {
- getClientUtils().sendDurableMessages(resourcesManager, brokered, addr, user, 15);
- }
-
- for (Address addr : standardAddresses) {
- getClientUtils().sendDurableMessages(resourcesManager, standard, addr, user, 15);
- }
-
- log.info("------------------------------------------------------------");
- log.info("------------------- Start with restarting -------------------");
- log.info("------------------------------------------------------------");
-
- List pods = kubernetes.listPods();
- int runningPodsBefore = pods.size();
- log.info("Number of running pods before restarting any: {}", runningPodsBefore);
-
- for (Label label : labels) {
- log.info("Restarting {}", label.labelValue);
- KubeCMDClient.deletePodByLabel(label.getLabelName(), label.getLabelValue());
- Thread.sleep(30_000);
- TestUtils.waitForExpectedReadyPods(kubernetes, kubernetes.getInfraNamespace(), runningPodsBefore, new TimeoutBudget(10, TimeUnit.MINUTES));
- assertSystemWorks(brokered, standard, user, brokeredAddresses, standardAddresses);
- }
-
- log.info("Receiving messages after admin pod restart");
-
- for (Address addr : brokeredAddresses) {
- getClientUtils().receiveDurableMessages(resourcesManager, brokered, addr, user, 15);
- }
-
- for (Address addr : standardAddresses) {
- getClientUtils().receiveDurableMessages(resourcesManager, standard, addr, user, 15);
- }
-
- }
-
- @ParameterizedTest(name = "testAddressSpaceKubernetesApiServerRestart-{0}-space")
- @ValueSource(strings = {"standard", "brokered"})
- void testAddressSpaceKubernetesApiServerRestart(String type) throws Exception {
-
- try {
- SystemtestsKubernetesApps.deployProxyApiApp();
- String proxyDnsName = SystemtestsKubernetesApps.getProxyApiDnsName();
-
- AddressSpace standard = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("space-k8api-restart-" + type)
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(type)
- .withPlan(AddressSpaceType.STANDARD.toString().equals(type) ? AddressSpacePlans.STANDARD_SMALL : AddressSpacePlans.BROKERED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- isolatedResourcesManager.createAddressSpaceList(standard);
-
- // configure admin/agent pod to use api proxy
- Map adminLabels = new HashMap<>();
- adminLabels.put(LabelKeys.INFRA_UUID, AddressSpaceUtils.getAddressSpaceInfraUuid(standard));
- if ("brokered".equals(type)) {
- adminLabels.put(LabelKeys.ROLE, "agent");
- } else {
- adminLabels.put(LabelKeys.NAME, "admin");
- }
- adminLabels.put(LabelKeys.APP, "enmasse");
-
- kubernetes.listDeployments(adminLabels).forEach(d -> {
- KubeCMDClient.runOnCluster("get", "deployments", "-n", kubernetes.getInfraNamespace(), "-o", "wide");
- ExecutionResultData labelRes = KubeCMDClient.setResourceEnvVarByLabel(Optional.of(kubernetes.getInfraNamespace()), "deployment", Optional.of("agent"), "KUBERNETES_SERVICE_HOST", d.getMetadata().getName(), proxyDnsName);
- assertTrue(labelRes.getRetCode());
- labelRes = KubeCMDClient.setResourceEnvVarByLabel(Optional.of(kubernetes.getInfraNamespace()), "deployment", Optional.of("agent"), "KUBERNETES_SERVICE_PORT", d.getMetadata().getName(), "8443");
- assertTrue(labelRes.getRetCode());
- });
-
- Iterator itr = Stream.generate(() -> {
- String name = "test-queue." + UUID.randomUUID();
- return new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, name))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress(name)
- .withPlan(AddressSpaceType.STANDARD.toString().equals(type) ? DestinationPlan.STANDARD_SMALL_QUEUE : DestinationPlan.BROKERED_QUEUE)
- .endSpec()
- .build();
- }).limit(2).collect(Collectors.toList()).iterator();
-
- // Create address before proxy goes away
- resourcesManager.setAddresses(itr.next());
-
- Kubernetes.getInstance().setDeploymentReplicas(Kubernetes.getInstance().getInfraNamespace(), SystemtestsKubernetesApps.API_PROXY, 0);
- LOGGER.info("api-proxy scaled down");
- TestUtils.waitUntilCondition(() -> {
- return kubernetes.listPods(Collections.singletonMap(LabelKeys.APP, SystemtestsKubernetesApps.API_PROXY)).size() == 0;
- }, Duration.ofMinutes(1), Duration.ofSeconds(10));
- LOGGER.info("api-proxy stopped");
- // we now know admin will have been disconnected from the api-server
- Kubernetes.getInstance().setDeploymentReplicas(Kubernetes.getInstance().getInfraNamespace(), SystemtestsKubernetesApps.API_PROXY, 1);
- LOGGER.info("api-proxy scaled up");
-
- // Create address after proxy has returned
- resourcesManager.setAddresses(itr.next());
- } finally {
- SystemtestsKubernetesApps.deleteProxyApiApp();
- }
- }
-
- @Test
- void testMonitoringTools() throws Exception {
- AddressSpace standard = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("standard-space-monitor")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.STANDARD.toString())
- .withPlan(AddressSpacePlans.STANDARD_UNLIMITED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- resourcesManager.createAddressSpace(standard);
- resourcesManager.createOrUpdateUser(standard, new UserCredentials("jenda", "cenda"));
- resourcesManager.setAddresses(AddressUtils.getAllStandardAddresses(standard).toArray(new Address[0]));
-
- String qdRouterName = TestUtils.listRunningPods(kubernetes, standard).stream()
- .filter(pod -> pod.getMetadata().getName().contains("qdrouter"))
- .collect(Collectors.toList()).get(0).getMetadata().getName();
- assertTrue(KubeCMDClient.runQDstat(kubernetes.getInfraNamespace(), qdRouterName, "-c", "--sasl-username=jenda", "--sasl-password=cenda").getRetCode());
- assertTrue(KubeCMDClient.runQDstat(kubernetes.getInfraNamespace(), qdRouterName, "-a", "--sasl-username=jenda", "--sasl-password=cenda").getRetCode());
- assertTrue(KubeCMDClient.runQDstat(kubernetes.getInfraNamespace(), qdRouterName, "-l", "--sasl-username=jenda", "--sasl-password=cenda").getRetCode());
- }
-
- @Test
- @Tag(NON_PR)
- void testMessagingDuringRestartComponents() throws Exception {
- List labels = new LinkedList<>();
- labels.add(new Label("name", "address-space-controller"));
- labels.add(new Label("name", "enmasse-operator"));
-
- UserCredentials user = new UserCredentials("frantisek", "dobrota");
- AddressSpace standard = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("addr-space-restart-standard")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.STANDARD.toString())
- .withPlan(AddressSpacePlans.STANDARD_UNLIMITED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- AddressSpace brokered = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("addr-space-restart-brokered")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.BROKERED.toString())
- .withPlan(AddressSpacePlans.BROKERED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- isolatedResourcesManager.createAddressSpaceList(standard, brokered);
- resourcesManager.createOrUpdateUser(brokered, user);
- resourcesManager.createOrUpdateUser(standard, user);
-
- List brokeredAddresses = AddressUtils.getAllBrokeredAddresses(brokered);
- List standardAddresses = AddressUtils.getAllStandardAddresses(standard);
-
- resourcesManager.setAddresses(brokeredAddresses.toArray(new Address[0]));
- resourcesManager.setAddresses(standardAddresses.toArray(new Address[0]));
-
- getClientUtils().assertCanConnect(brokered, user, brokeredAddresses, resourcesManager);
- getClientUtils().assertCanConnect(standard, user, standardAddresses, resourcesManager);
-
- log.info("------------------------------------------------------------");
- log.info("------------------- Start with restarting -------------------");
- log.info("------------------------------------------------------------");
-
- List pods = kubernetes.listPods();
- int runningPodsBefore = pods.size();
- log.info("Number of running pods before restarting any: {}", runningPodsBefore);
-
- for (Address addr : brokeredAddresses) {
- log.info("Starting messaging in address {} and address space {}", addr.getSpec().getAddress(), brokered.getMetadata().getName());
- for (Label label : labels) {
- getClientUtils().assertCanConnect(brokered, user, brokeredAddresses, resourcesManager);
- doMessagingDuringRestart(label, runningPodsBefore, user, brokered, addr);
- getClientUtils().assertCanConnect(brokered, user, brokeredAddresses, resourcesManager);
- }
- }
-
- for (Address addr : standardAddresses) {
- log.info("Starting messaging in address {} and address space {}", addr.getSpec().getAddress(), standard.getMetadata().getName());
- for (Label label : labels) {
- getClientUtils().assertCanConnect(standard, user, standardAddresses, resourcesManager);
- doMessagingDuringRestart(label, runningPodsBefore, user, standard, addr);
- getClientUtils().assertCanConnect(standard, user, standardAddresses, resourcesManager);
- }
- }
- }
-
- @Test
- @Tag(NON_PR)
- public void testFullBrokerRemainsOperableStandardWithRetry() throws Exception {
- AddressPlan exampleAddressPlan = getAddressPlanBrokerOperableOnFullQueue();
- AddressSpace exampleAddressSpace = getAddressSpaceBrokerOperableOnFullQueue(exampleAddressPlan);
- doTestBrokerRemainsOperableOnFullAddress(exampleAddressPlan, exampleAddressSpace, true);
- }
-
- private AddressPlan getAddressPlanBrokerOperableOnFullQueue() throws Exception {
- AddressPlan exampleAddressPlan = PlanUtils.createAddressPlanObject("test-queue-keeps-operable", AddressType.QUEUE,
- Arrays.asList(new ResourceRequest("broker", 0.5), new ResourceRequest("router", 0.5)));
-
- resourcesManager.createAddressPlan(exampleAddressPlan);
- return exampleAddressPlan;
- }
-
- private AddressSpace getAddressSpaceBrokerOperableOnFullQueue(AddressPlan exampleAddressPlan) throws Exception {
- StandardInfraConfig testInfra = new StandardInfraConfigBuilder()
- .withNewMetadata()
- .withName("infra-keeps-operable-s")
- .endMetadata()
- .withNewSpec()
- .withBroker(new StandardInfraConfigSpecBrokerBuilder()
- .withAddressFullPolicy("FAIL")
- .withNewResources()
- .withMemory("512Mi")
- .withStorage("512Mi")
- .endResources()
- .withGlobalMaxSize("1Mb")
- .build())
- .withRouter(new StandardInfraConfigSpecRouterBuilder()
- .withNewResources()
- .withMemory("256Mi")
- .endResources()
- .withMinReplicas(1)
- .withLinkCapacity(250)
- .build())
- .withAdmin(new StandardInfraConfigSpecAdminBuilder()
- .withNewResources()
- .withMemory("512Mi")
- .endResources()
- .build())
- .endSpec()
- .build();
- resourcesManager.createInfraConfig(testInfra);
-
- AddressSpacePlan exampleSpacePlan = new AddressSpacePlanBuilder()
- .withNewMetadata()
- .withName("test-plan-keeps-operable")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withAddressSpaceType(AddressSpaceType.STANDARD.toString())
- .withInfraConfigRef(testInfra.getMetadata().getName())
- .withResourceLimits(Arrays.asList(
- new ResourceAllowance("broker", 1.0),
- new ResourceAllowance("router", 1.0),
- new ResourceAllowance("aggregate", 2.0))
- .stream().collect(Collectors.toMap(ResourceAllowance::getName, ResourceAllowance::getMax)))
- .withAddressPlans(Arrays.asList(exampleAddressPlan.getMetadata().getName()))
- .endSpec()
- .build();
- resourcesManager.createAddressSpacePlan(exampleSpacePlan);
-
- AddressSpace exampleAddressSpace = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("test-address-space-keeps-operable")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.STANDARD.toString())
- .withPlan(exampleSpacePlan.getMetadata().getName())
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
-
- resourcesManager.createAddressSpace(exampleAddressSpace);
- return exampleAddressSpace;
- }
-
- @Tag(NON_PR)
- @DisplayName("testFullBrokerRemainsOperableBrokered")
- public void testFullBrokerRemainsOperableBrokered() throws Exception {
- BrokeredInfraConfig testInfra = new BrokeredInfraConfigBuilder()
- .withNewMetadata()
- .withName("infra-keeps-operable-b")
- .endMetadata()
- .withNewSpec()
- .withBroker(new BrokeredInfraConfigSpecBrokerBuilder()
- .withAddressFullPolicy("FAIL")
- .withNewResources()
- .withMemory("512Mi")
- .withStorage("512Mi")
- .endResources()
- .withGlobalMaxSize("1Mb")
- .build())
- .withAdmin(new BrokeredInfraConfigSpecAdminBuilder()
- .withNewResources()
- .withMemory("512Mi")
- .endResources()
- .build())
- .endSpec()
- .build();
- resourcesManager.createInfraConfig(testInfra);
-
- AddressPlan exampleAddressPlan = PlanUtils.createAddressPlanObject("test-queue-keeps-operable", AddressType.QUEUE,
- Arrays.asList(new ResourceRequest("broker", 0.5)));
-
- resourcesManager.createAddressPlan(exampleAddressPlan);
-
- AddressSpacePlan exampleSpacePlan = new AddressSpacePlanBuilder()
- .withNewMetadata()
- .withName("test-plan-keeps-operable")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withAddressSpaceType(AddressSpaceType.BROKERED.toString())
- .withInfraConfigRef(testInfra.getMetadata().getName())
- .withResourceLimits(Arrays.asList(
- new ResourceAllowance("broker", 1.0))
- .stream().collect(Collectors.toMap(ResourceAllowance::getName, ResourceAllowance::getMax)))
- .withAddressPlans(Arrays.asList(exampleAddressPlan.getMetadata().getName()))
- .endSpec()
- .build();
- resourcesManager.createAddressSpacePlan(exampleSpacePlan);
-
- AddressSpace exampleAddressSpace = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("test-address-space-keeps-operable")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.BROKERED.toString())
- .withPlan(exampleSpacePlan.getMetadata().getName())
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
-
- resourcesManager.createAddressSpace(exampleAddressSpace);
-
- doTestBrokerRemainsOperableOnFullAddress(exampleAddressPlan, exampleAddressSpace, false);
-
- }
-
- private void doTestBrokerRemainsOperableOnFullAddress(AddressPlan addressPlan, AddressSpace addressSpace, boolean retry) throws Exception {
- UserCredentials user = new UserCredentials("dummy", "supersecure");
- resourcesManager.createOrUpdateUser(addressSpace, user);
-
- var address1 = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(kubernetes.getInfraNamespace())
- .withName(AddressUtils.generateAddressMetadataName(addressSpace, "example-queue-1"))
- .endMetadata()
- .withNewSpec()
- .withType(AddressType.QUEUE.toString())
- .withAddress("example-queue-1")
- .withPlan(addressPlan.getMetadata().getName())
- .endSpec()
- .build();
-
- var address2 = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(kubernetes.getInfraNamespace())
- .withName(AddressUtils.generateAddressMetadataName(addressSpace, "example-queue-2"))
- .endMetadata()
- .withNewSpec()
- .withType(AddressType.QUEUE.toString())
- .withAddress("example-queue-2")
- .withPlan(addressPlan.getMetadata().getName())
- .endSpec()
- .build();
-
- resourcesManager.setAddresses(address1, address2);
- assertEquals(
- resourcesManager.getAddress(address1.getMetadata().getNamespace(), address1).getStatus().getBrokerStatuses(),
- resourcesManager.getAddress(address2.getMetadata().getNamespace(), address2).getStatus().getBrokerStatuses(),
- "Addresses are not colocated on the same broker");
-
- AmqpClient client = getAmqpClientFactory().createQueueClient(addressSpace);
- client.getConnectOptions().setCredentials(user);
- byte[] bytes = new byte[1024 * 100];
- Random random = new Random();
- int messagesSent = 0;
- log.info("Start time: get queue full");
- Message message = Message.Factory.create();
- random.nextBytes(bytes);
- message.setBody(new AmqpValue(new Data(new Binary(bytes))));
- message.setAddress(address1.getSpec().getAddress());
- message.setDurable(true);
-
- Stream messageStream = Stream.generate(() -> message);
- messagesSent = client.sendMessagesCheckDelivery(address1.getSpec().getAddress(), messageStream::iterator, protonDelivery -> protonDelivery.remotelySettled() && protonDelivery.getRemoteState().getType().equals(DeliveryStateType.Rejected))
- .get(5, TimeUnit.MINUTES);
-
- assertTrue(messagesSent > 0, "Incorrect test set up, 0 messages sent");
-
- resourcesManager.deleteAddresses(address1);
- AddressUtils.waitForAddressDeleted(address1, new TimeoutBudget(1, TimeUnit.MINUTES));
-
- if (retry) {
- QueueTest.runQueueTestRetrying(client, address2, messagesSent/2, Duration.ofSeconds(30));
- } else {
- QueueTest.runQueueTest(client, address2, messagesSent/2);
- }
-
- }
-
- @Test
- void testCreateDeleteAddressSpace() throws Exception {
- AddressSpace addressSpace = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("test-create-delete-address-space")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.STANDARD.toString())
- .withPlan(AddressSpacePlans.STANDARD_UNLIMITED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
-
- resourcesManager.createAddressSpace(addressSpace, false);
- resourcesManager.deleteAddressSpace(addressSpace);
- }
-
- /////////////////////////////////////////////////////////////////////
- // help methods
- /////////////////////////////////////////////////////////////////////
-
- private void assertSystemWorks(AddressSpace brokered, AddressSpace standard, UserCredentials existingUser,
- List brAddresses, List stAddresses) throws Exception {
- log.info("Check if system works");
- getClientUtils().assertCanConnect(standard, existingUser, stAddresses, resourcesManager);
- getClientUtils().assertCanConnect(brokered, existingUser, brAddresses, resourcesManager);
- resourcesManager.getAddressSpace(brokered.getMetadata().getName());
- resourcesManager.getAddressSpace(standard.getMetadata().getName());
- resourcesManager.createOrUpdateUser(brokered, new UserCredentials("jenda", "cenda"));
- resourcesManager.createOrUpdateUser(standard, new UserCredentials("jura", "fura"));
- }
-
- private void doMessagingDuringRestart(Label label, int runningPodsBefore, UserCredentials user, AddressSpace space, Address addr) throws Exception {
- long sleepMillis = 500;
- log.info("Starting messaging");
- AddressType addressType = AddressType.getEnum(addr.getSpec().getType());
- AmqpClient client = getAmqpClientFactory().createAddressClient(space, addressType);
- client.getConnectOptions().setCredentials(user);
-
- var stopSend = new CompletableFuture<>();
-
- var recvFut = client.recvMessagesWithStatus(addr.getSpec().getAddress(), msg -> {
- log.info("Message received");
- return false;
- });
-
-
- var sendFut = client.sendMessages(addr.getSpec().getAddress(),
- Stream.generate(() -> UUID.randomUUID().toString()).limit(1000).collect(Collectors.toList()),
- msg -> {
- if (stopSend.isDone()) {
- return true;
- }
- try {
- Thread.sleep(sleepMillis);
- } catch (InterruptedException e) {
- log.error("Error waiting between sends", e);
- stopSend.completeExceptionally(e);
- return true;
- }
- return false;
- });
-
- log.info("Restarting {}", label.labelValue);
- KubeCMDClient.deletePodByLabel(label.getLabelName(), label.getLabelValue());
- Thread.sleep(30_000);
- TestUtils.waitForExpectedReadyPods(kubernetes, kubernetes.getInfraNamespace(), runningPodsBefore, new TimeoutBudget(10, TimeUnit.MINUTES));
- if (stopSend.isCompletedExceptionally()) {
- stopSend.get();
- }
- stopSend.complete(new Object());
- try {
- Thread.sleep(10_000);
- } catch (InterruptedException e) {
- log.error("Error waiting between stop sender and receiver", e);
- }
- recvFut.closeGracefully();
-
- int received = recvFut.getResult().get(10, TimeUnit.SECONDS).size();
- int sent = sendFut.get(10, TimeUnit.SECONDS);
- assertEquals(sent, received, "Missmatch between messages sent and received");
- }
-
- private static class Label {
- String labelName;
- String labelValue;
-
- Label(String labelName, String labelValue) {
- this.labelName = labelName;
- this.labelValue = labelValue;
- }
-
- String getLabelName() {
- return labelName;
- }
-
- String getLabelValue() {
- return labelValue;
- }
- }
-}
-
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/isolated/Credentials.java b/systemtests/src/test/java/io/enmasse/systemtest/isolated/Credentials.java
deleted file mode 100644
index 7965eb551ad..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/isolated/Credentials.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2018, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.isolated;
-
-import io.enmasse.systemtest.UserCredentials;
-
-public final class Credentials {
- private Credentials() {
- }
-
- public static String namespace() {
- return System.getenv().getOrDefault("SYSTEMTESTS_CREDENTIALS_NAMESPACE", "pepik");
- }
-
- public static String user() {
- return System.getenv().getOrDefault("SYSTEMTESTS_CREDENTIALS_USER", "user");
- }
-
- public static String password() {
- return System.getenv().getOrDefault("SYSTEMTESTS_CREDENTIALS_PASSWORD", "user");
- }
-
- public static UserCredentials userCredentials() {
- return new UserCredentials(user(), password());
- }
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/isolated/PersistentMessagesTest.java b/systemtests/src/test/java/io/enmasse/systemtest/isolated/PersistentMessagesTest.java
deleted file mode 100644
index edbe1f952c7..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/isolated/PersistentMessagesTest.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright 2019, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.isolated;
-
-import io.enmasse.address.model.Address;
-import io.enmasse.address.model.AddressBuilder;
-import io.enmasse.address.model.AddressSpace;
-import io.enmasse.address.model.AddressSpaceBuilder;
-import io.enmasse.systemtest.UserCredentials;
-import io.enmasse.systemtest.amqp.AmqpClient;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.isolated.ITestBaseIsolated;
-import io.enmasse.systemtest.logs.CustomLogger;
-import io.enmasse.systemtest.model.addressplan.DestinationPlan;
-import io.enmasse.systemtest.model.addressspace.AddressSpacePlans;
-import io.enmasse.systemtest.model.addressspace.AddressSpaceType;
-import io.enmasse.systemtest.time.TimeoutBudget;
-import io.enmasse.systemtest.utils.AddressUtils;
-import io.enmasse.systemtest.utils.TestUtils;
-import org.apache.qpid.proton.message.Message;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
-
-class PersistentMessagesTest extends TestBase implements ITestBaseIsolated {
- private static Logger log = CustomLogger.getLogger();
- private UserCredentials credentials = new UserCredentials("test", "test");
-
- @Test
- @Tag(ACCEPTANCE)
- void testBrokeredPersistentMessages() throws Exception {
- AddressSpace brokered = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("brokered-persistent")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.BROKERED.toString())
- .withPlan(AddressSpacePlans.BROKERED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- resourcesManager.createAddressSpace(brokered);
- resourcesManager.createOrUpdateUser(brokered, credentials);
-
-
- Address brokeredQueue = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(brokered.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(brokered, "test-queue-brokered"))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress("test-queue-brokered")
- .withPlan(DestinationPlan.BROKERED_QUEUE)
- .endSpec()
- .build();
- doTestQueuePersistentMessages(brokered, brokeredQueue, 100);
- }
-
- @Test
- @Tag(ACCEPTANCE)
- void testStandardPersistentMessages() throws Exception {
- AddressSpace standard = new AddressSpaceBuilder()
- .withNewMetadata()
- .withName("standard-persistent")
- .withNamespace(kubernetes.getInfraNamespace())
- .endMetadata()
- .withNewSpec()
- .withType(AddressSpaceType.STANDARD.toString())
- .withPlan(AddressSpacePlans.STANDARD_UNLIMITED)
- .withNewAuthenticationService()
- .withName("standard-authservice")
- .endAuthenticationService()
- .endSpec()
- .build();
- resourcesManager.createAddressSpace(standard);
- resourcesManager.createOrUpdateUser(standard, credentials);
-
- Address standardQueue = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, "test-queue-standard"))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress("test-queue-standard")
- .withPlan(DestinationPlan.STANDARD_SMALL_QUEUE)
- .endSpec()
- .build();
- doTestQueuePersistentMessages(standard, standardQueue, 30);
-
- Address standardLargeQueue = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, "test-large-queue-standard"))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress("test-large-queue-standard")
- .withPlan(DestinationPlan.STANDARD_LARGE_QUEUE)
- .endSpec()
- .build();
- doTestQueuePersistentMessages(standard, standardLargeQueue, 30);
-
- Address standardXLargeQueue = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, "test-xlarge-queue-standard"))
- .endMetadata()
- .withNewSpec()
- .withType("queue")
- .withAddress("test-xlarge-queue-standard")
- .withPlan(DestinationPlan.STANDARD_XLARGE_QUEUE)
- .endSpec()
- .build();
- doTestQueuePersistentMessages(standard, standardXLargeQueue, 30);
-
- Address standardTopic = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, "test-topic-standard"))
- .endMetadata()
- .withNewSpec()
- .withType("topic")
- .withAddress("test-topic-standard")
- .withPlan(DestinationPlan.STANDARD_LARGE_TOPIC)
- .endSpec()
- .build();
- Address standardSub = new AddressBuilder()
- .withNewMetadata()
- .withNamespace(standard.getMetadata().getNamespace())
- .withName(AddressUtils.generateAddressMetadataName(standard, "test-sub-standard"))
- .endMetadata()
- .withNewSpec()
- .withType("subscription")
- .withAddress("test-sub-standard")
- .withTopic(standardTopic.getSpec().getAddress())
- .withPlan(DestinationPlan.STANDARD_SMALL_SUBSCRIPTION)
- .endSpec()
- .build();
- doTestTopicPersistentMessages(standard, standardTopic, standardSub);
- }
-
- private void doTestQueuePersistentMessages(AddressSpace addSpace, Address address, int messagesBatch) throws Exception {
- resourcesManager.setAddresses(address);
-
- // Wait for the first console pod to be terminated
- TestUtils.waitForConsoleRollingUpdate(kubernetes.getInfraNamespace());
- TestUtils.waitUntilDeployed(kubernetes.getInfraNamespace());
-
- int podCount = kubernetes.listPods().size();
- clientUtils.sendDurableMessages(resourcesManager, addSpace, address, credentials, messagesBatch);
- restartBrokers(podCount);
-
- // Seems that the service/route can sometimes not be immediately available despite the pod being Ready.
- assertConnectable(addSpace, credentials);
- clientUtils.receiveDurableMessages(resourcesManager, addSpace, address, credentials, messagesBatch);
-
- }
-
- private void doTestTopicPersistentMessages(AddressSpace addSpace, Address topic, Address subscription) throws Exception {
- resourcesManager.setAddresses(topic, subscription);
-
- int podCount = kubernetes.listPods().size();
-
- AmqpClient client = resourcesManager.getAmqpClientFactory().createTopicClient(addSpace);
- client.getConnectOptions().setCredentials(credentials);
-
- log.info("Subscribe first receiver");
- Future> recvResults = client.recvMessages(AddressUtils.getQualifiedSubscriptionAddress(subscription), 30);
- clientUtils.sendDurableMessages(resourcesManager, addSpace, topic, credentials, 30);
- assertThat("Wrong messages received: ", recvResults.get(1, TimeUnit.MINUTES).size(), is(30));
- clientUtils.sendDurableMessages(resourcesManager, addSpace, topic, credentials, 30);
-
- restartBrokers(podCount);
-
- // Seems that the service/route can sometimes not be immediately available despite the pod being Ready.
- assertConnectable(addSpace, credentials);
-
- log.info("Subscribe receiver again");
- recvResults = client.recvMessages(AddressUtils.getQualifiedSubscriptionAddress(subscription), 30);
- assertThat("Wrong messages received: batch2", recvResults.get(1, TimeUnit.MINUTES).size(), is(30));
- }
-
- private void restartBrokers(int podCount) throws Exception {
- Map labelSelector = Collections.singletonMap("role", "broker");
- List uids = kubernetes.listPods(kubernetes.getInfraNamespace(), labelSelector).stream().map(pod -> pod.getMetadata().getUid()).collect(Collectors.toList());
-
- kubernetes.deletePod(kubernetes.getInfraNamespace(), labelSelector);
-
- waitForPodsToTerminate(uids);
- TestUtils.waitForExpectedReadyPods(kubernetes, kubernetes.getInfraNamespace(), podCount, new TimeoutBudget(10, TimeUnit.MINUTES));
- log.info("Broker pods restarted");
- }
-
- private void assertConnectable(AddressSpace space, UserCredentials user) throws Exception {
- TimeoutBudget budget = new TimeoutBudget(1, TimeUnit.MINUTES);
- String name = space.getMetadata().getName();
- do {
- try {
- clientUtils.connectAddressSpace(resourcesManager, space, user);
- log.info("Successfully connected to address space : {}", name);
- return;
- } catch (IOException e) {
- log.info("Failed to connect to address space: {} - {}", name, e.getMessage());
- }
- Thread.sleep(1000);
- } while (!budget.timeoutExpired());
-
- fail(String.format("Failed to assert address space %s connectable within timeout", name));
- }
-
-}
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/isolated/api/ApiServerTest.java b/systemtests/src/test/java/io/enmasse/systemtest/isolated/api/ApiServerTest.java
deleted file mode 100644
index 4b92a589b01..00000000000
--- a/systemtests/src/test/java/io/enmasse/systemtest/isolated/api/ApiServerTest.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * Copyright 2018, EnMasse authors.
- * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
- */
-package io.enmasse.systemtest.isolated.api;
-
-import io.enmasse.address.model.Address;
-import io.enmasse.address.model.AddressBuilder;
-import io.enmasse.address.model.AddressPlanDescription;
-import io.enmasse.address.model.AddressSpace;
-import io.enmasse.address.model.AddressSpaceBuilder;
-import io.enmasse.address.model.AddressSpacePlanDescription;
-import io.enmasse.address.model.AddressSpaceSchema;
-import io.enmasse.address.model.AddressSpaceSchemaList;
-import io.enmasse.address.model.AddressTypeInformation;
-import io.enmasse.address.model.DoneableAddressSpace;
-import io.enmasse.admin.model.v1.AddressPlan;
-import io.enmasse.admin.model.v1.AddressSpacePlan;
-import io.enmasse.admin.model.v1.ResourceAllowance;
-import io.enmasse.admin.model.v1.ResourceRequest;
-import io.enmasse.systemtest.UserCredentials;
-import io.enmasse.systemtest.bases.TestBase;
-import io.enmasse.systemtest.bases.isolated.ITestIsolatedStandard;
-import io.enmasse.systemtest.condition.OpenShift;
-import io.enmasse.systemtest.executor.ExecutionResultData;
-import io.enmasse.systemtest.isolated.Credentials;
-import io.enmasse.systemtest.logs.CustomLogger;
-import io.enmasse.systemtest.model.address.AddressType;
-import io.enmasse.systemtest.model.addressplan.DestinationPlan;
-import io.enmasse.systemtest.model.addressspace.AddressSpacePlans;
-import io.enmasse.systemtest.model.addressspace.AddressSpaceType;
-import io.enmasse.systemtest.platform.KubeCMDClient;
-import io.enmasse.systemtest.time.TimeoutBudget;
-import io.enmasse.systemtest.utils.AddressSpaceUtils;
-import io.enmasse.systemtest.utils.AddressUtils;
-import io.enmasse.systemtest.utils.PlanUtils;
-import io.enmasse.user.model.v1.User;
-import io.enmasse.user.model.v1.UserAuthenticationType;
-import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBindingBuilder;
-import io.fabric8.kubernetes.api.model.rbac.SubjectBuilder;
-import io.fabric8.kubernetes.client.KubernetesClientException;
-import io.vertx.core.json.JsonObject;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.slf4j.Logger;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static org.hamcrest.CoreMatchers.anyOf;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class ApiServerTest extends TestBase implements ITestIsolatedStandard {
- private static Logger log = CustomLogger.getLogger();
-
- private static Set toStrings(final Collection items, final Function