100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Fix bug where rule engine asset states weren't updated when asset was modified (#852)
Rich Turner9d4a1a6023e0
diff --git a/deployment/build.gradle b/deployment/build.gradleindex 04d63ee40..b2702d807 100644--- a/deployment/build.gradle+++ b/deployment/build.gradle@@ -1,4 +1,30 @@+apply plugin: "java-library"++dependencies {+ api resolveProject(":setup")+}++task license {+ doLast {+ def toConcatenate = isCustomProject() ? files("${project(":openremote").projectDir}/LICENSE.txt", "${rootDir}/LICENSE.txt") : files("${rootDir}/LICENSE.txt")+ def outputFileName = "${buildDir}/image/manager/app/LICENSE.txt"+ def output = new File(outputFileName)+ if (output.exists()) {+ output.delete()+ }+ output.getParentFile().mkdirs()+ output.createNewFile()+ output.write('') // truncate output if needed+ toConcatenate.each { f -> output << f.text }+ }+}+task installDist(type: Copy) {+ dependsOn (parent.getTasksByName('installDist', true).findAll {+ // Don't create circular dependency or depend on built in openremote submodule apps+ it.project != project && !it.project.path.startsWith(":openremote:ui:app")+ })+into("$buildDir")from "Dockerfile"@@ -7,4 +33,8 @@ task installDist(type: Copy) {from projectDirexclude "build.gradle", "Dockerfile", "build", "**/*.mbtiles", "src", "**/*.md", ".gitignore", "**/*.encrypted"}++ into("image/manager/extensions") {+ from getDeploymentJars()+ }}diff --git a/gradle.properties b/gradle.propertiesindex 70fe4b2f7..30d272b90 100644--- a/gradle.properties+++ b/gradle.properties@@ -13,7 +13,7 @@ jbossLoggingAnnotationsVersion = 2.0.2.FinalkeycloakVersion = 18.0.2classgraphVersion=4.8.149jacksonVersion = 2.13.3-groovyVersion = 3.0.9+groovyVersion = 3.0.10groovySandboxVersion = 4.0.0sqliteVersion = 3.34.0hibernateVersion = 5.6.10.Final@@ -35,7 +35,7 @@ saxonHEVersion = 11.3jmxtermVersion = 1.0.0nettyVersion = 4.1.79.FinalflywaydbVersion = 9.0.1-ical4jVersion = 2.1.5+ical4jVersion = 3.2.6friendlyIdVersion = 1.0.1geotoolsVersion = 19.1firebaseAdminVersion = 7.1.0diff --git a/manager/Dockerfile b/manager/Dockerfileindex 356bcf102..ff9288325 100644--- a/manager/Dockerfile+++ b/manager/Dockerfile@@ -68,6 +68,7 @@ WORKDIR /opt/appADD lib /opt/app/libADD web /opt/webADD map /opt/map+COPY ./extension[s]/ /deployment/manager/extensions/EXPOSE 8080EXPOSE 1883diff --git a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.javaindex fa812ba36..0bc0bf506 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java@@ -20,6 +20,7 @@package org.openremote.manager.mqtt;import io.netty.buffer.ByteBuf;+import io.netty.channel.ChannelId;import io.netty.handler.codec.mqtt.MqttQoS;import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;import org.keycloak.KeycloakSecurityContext;diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex b344a4685..a10a9a443 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -490,73 +490,43 @@ public class RulesService extends RouteBuilder implements ContainerService, Asseprotected void processAssetChange(Asset<?> asset, PersistenceEvent<Asset<?>> persistenceEvent) {withLock(getClass().getSimpleName() + "::processAssetChange", () -> {- // We must load the asset from database (only when required), as the- // persistence event might not contain a completely loaded asset- BiFunction<Asset<?>, Attribute<?>, AssetState<?>> buildAssetState = (loadedAsset, attribute) ->- new AssetState<>(loadedAsset, ValueUtil.clone(attribute), Source.INTERNAL);-switch (persistenceEvent.getCause()) {case CREATE: {- // New asset has been created so get attributes that don't have RULE_STATE=false meta- List<Attribute<?>> ruleStateAttributes = asset+ // Load rule state attributes into rules engine+ asset.getAttributes().stream()- .filter(RulesService::attributeIsRuleState).collect(Collectors.toList());-- // Asset<?> used to be loaded for each attribute which is inefficient- Asset<?> loadedAsset = ruleStateAttributes.isEmpty() ? null : assetStorageService.find(asset.getId(),- true);-- // Build an update with a fully loaded asset- ruleStateAttributes.forEach(attribute -> {-- // If the asset is now gone it was deleted immediately after being inserted, nothing more to do- if (loadedAsset == null)- return;-- AssetState<?> assetState = buildAssetState.apply(loadedAsset, attribute);- LOG.finer("Asset was persisted (" + persistenceEvent.getCause() + "), inserting fact: " + assetState);- updateAssetState(assetState);- });+ .filter(RulesService::attributeIsRuleState)+ .forEach(attribute -> {+ AssetState<?> assetState = new AssetState<>(asset, attribute, Source.INTERNAL);+ LOG.finer("Asset was persisted (" + persistenceEvent.getCause() + "), inserting fact: " + assetState);+ updateAssetState(assetState);+ });break;}case UPDATE: {- int attributesIndex = Arrays.asList(persistenceEvent.getPropertyNames()).indexOf("attributes");- if (attributesIndex < 0) {- return;- }- // Fully load the asset to get parent and path info- Asset<?> loadedAsset = assetStorageService.find(asset.getId(), true);+ boolean attributesChanged = Arrays.asList(persistenceEvent.getPropertyNames()).contains("attributes");+ AttributeMap oldAttributes = attributesChanged ? ((AttributeMap) persistenceEvent.getPreviousState("attributes")) : asset.getAttributes();+ AttributeMap currentAttributes = asset.getAttributes();- // If the asset is now gone it was deleted immediately after being updated, nothing more to do- if (loadedAsset == null)- return;-- List<Attribute<?>> oldStateAttributes = ((AttributeMap) persistenceEvent.getPreviousState("attributes"))+ List<Attribute<?>> oldStateAttributes = oldAttributes.stream()- .filter(RulesService::attributeIsRuleState)- .collect(toList());+ .filter(RulesService::attributeIsRuleState).toList();- List<Attribute<?>> newStateAttributes = ((AttributeMap) persistenceEvent.getCurrentState("attributes"))+ List<Attribute<?>> newStateAttributes = currentAttributes.stream()- .filter(RulesService::attributeIsRuleState)- .collect(Collectors.toList());-- // Retract obsolete or modified attributes- List<Attribute<?>> obsoleteOrModified = getAddedOrModifiedAttributes(newStateAttributes, oldStateAttributes).collect(toList());+ .filter(RulesService::attributeIsRuleState).toList();- obsoleteOrModified.forEach(attribute -> {- AssetState<?> assetState = buildAssetState.apply(loadedAsset, attribute);+ oldStateAttributes.forEach(attribute -> {+ AssetState<?> assetState = new AssetState<>(asset, attribute, Source.INTERNAL);LOG.finer("Asset was persisted (" + persistenceEvent.getCause() + "), retracting fact: " + assetState);retractAssetState(assetState);});- // Insert new or modified attributes- newStateAttributes.stream().filter(attr ->- !oldStateAttributes.contains(attr) || obsoleteOrModified.contains(attr))- .forEach(attribute -> {- AssetState<?> assetState = buildAssetState.apply(loadedAsset, attribute);+ // Insert new states+ newStateAttributes.forEach(attribute -> {+ AssetState<?> assetState = new AssetState<>(asset, attribute, Source.INTERNAL);LOG.finer("Asset was persisted (" + persistenceEvent.getCause() + "), inserting fact: " + assetState);updateAssetState(assetState);});diff --git a/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java b/model/src/main/java/org/openremote/model/calendar/CalendarEvent.javaindex 3517b7d40..300271945 100644--- a/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java+++ b/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java@@ -75,6 +75,7 @@ import java.util.Date;}* }</pre></blockquote>*/+// TODO: Update to ical4j 4 once released with DST bug fix https://github.com/ical4j/ical4j/issues/117public class CalendarEvent implements Serializable {protected Date start;protected Date end;diff --git a/project.gradle b/project.gradleindex 7d129855f..b4b10c73b 100644--- a/project.gradle+++ b/project.gradle@@ -93,19 +93,29 @@ if (project == rootProject) {workingDirectory = (isCustomProject() ? project(":openremote").projectDir.toString() : projectDir.toString())}"Demo Setup"(Application) {- moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.setup.main" : ".setup.main")+ moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.setup.demo" : ".setup.demo")envs = [OR_SETUP_TYPE: "demo"]}"Demo Setup with Proxy"(Application) {- moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.setup.main" : ".setup.main")+ moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.setup.demo" : ".setup.demo")envs = [OR_SETUP_TYPE: "demo",OR_WEBSERVER_LISTEN_HOST: "0.0.0.0",OR_SSL_PORT: "443"]}+ "Test Setup"(Application) {+ moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.setup.integration" : ".setup.integration")+ }+ "Test Setup with Proxy"(Application) {+ moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.setup.integration" : ".setup.integration")+ envs = [+ OR_WEBSERVER_LISTEN_HOST: "0.0.0.0",+ OR_SSL_PORT: "443"+ ]+ }"Empty"(Application) {moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.manager.main" : ".manager.main")}@@ -237,12 +247,6 @@ ext {getDeploymentJars = this.&getDeploymentJars}-if (project.convention.findPlugin(JavaPluginConvention)) {- // Change the output directory for the main and test source sets back to the old path- sourceSets.main.java.outputDir = new File(buildDir, "classes/main")- sourceSets.test.java.outputDir = new File(buildDir, "classes/test")-}-// Add UI tasksext.npmCommand = {cmd ->diff --git a/setup/build.gradle b/setup/build.gradleindex 0e2c368d8..3d02da7b4 100644--- a/setup/build.gradle+++ b/setup/build.gradle@@ -1,16 +1,31 @@apply plugin: "java-library"+sourceSets {+ integration+ demo+ load1+}++// dependencies declaration+configurations {+ integrationImplementation.extendsFrom(implementation)+ demoImplementation.extendsFrom(implementation)+ load1Implementation.extendsFrom(implementation)+}+dependencies {- api resolveProject(":manager")+ implementation resolveProject(":manager")}+// Use demo sourceset for jarjar {archivesBaseName = "openremote-demo-${project.name}"+ from sourceSets.demo.output}task installDist(type: Copy) {dependsOn jardependsOn resolveTask(":manager:installDist")from jar.archiveFile- into "${resolveProject(":manager").buildDir}/install/manager/lib"+ into "${resolveProject(":manager").buildDir}/install/manager/extensions"}diff --git a/setup/src/main/java/org/openremote/setup/demo/DemoSetupTasks.java b/setup/src/demo/java/org/openremote/setup/demo/DemoSetupTasks.javasimilarity index 100%rename from setup/src/main/java/org/openremote/setup/demo/DemoSetupTasks.javarename to setup/src/demo/java/org/openremote/setup/demo/DemoSetupTasks.javadiff --git a/setup/src/main/java/org/openremote/setup/demo/KeycloakDemoSetup.java b/setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.javasimilarity index 100%rename from setup/src/main/java/org/openremote/setup/demo/KeycloakDemoSetup.javarename to setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.javadiff --git a/setup/src/main/java/org/openremote/setup/demo/ManagerDemoAgentSetup.java b/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoAgentSetup.javasimilarity index 100%rename from setup/src/main/java/org/openremote/setup/demo/ManagerDemoAgentSetup.javarename to setup/src/demo/java/org/openremote/setup/demo/ManagerDemoAgentSetup.javadiff --git a/setup/src/main/java/org/openremote/setup/demo/ManagerDemoSetup.java b/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.javasimilarity index 100%rename from setup/src/main/java/org/openremote/setup/demo/ManagerDemoSetup.javarename to setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.javadiff --git a/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.java b/setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.javasimilarity index 100%rename from setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.javarename to setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.javadiff --git a/setup/src/main/resources/META-INF/services/org.openremote.model.setup.SetupTasks b/setup/src/demo/resources/META-INF/services/org.openremote.model.setup.SetupTaskssimilarity index 100%rename from setup/src/main/resources/META-INF/services/org.openremote.model.setup.SetupTasksrename to setup/src/demo/resources/META-INF/services/org.openremote.model.setup.SetupTasksdiff --git a/setup/src/main/resources/demo/rules/smartcity/DeKuip.json b/setup/src/demo/resources/demo/rules/smartcity/DeKuip.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/DeKuip.jsonrename to setup/src/demo/resources/demo/rules/smartcity/DeKuip.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/EnvironmentAlerts.json b/setup/src/demo/resources/demo/rules/smartcity/EnvironmentAlerts.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/EnvironmentAlerts.jsonrename to setup/src/demo/resources/demo/rules/smartcity/EnvironmentAlerts.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/Euromast.json b/setup/src/demo/resources/demo/rules/smartcity/Euromast.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/Euromast.jsonrename to setup/src/demo/resources/demo/rules/smartcity/Euromast.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/LightGroupOnOff.flow b/setup/src/demo/resources/demo/rules/smartcity/LightGroupOnOff.flowsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/LightGroupOnOff.flowrename to setup/src/demo/resources/demo/rules/smartcity/LightGroupOnOff.flowdiff --git a/setup/src/main/resources/demo/rules/smartcity/Markthal.json b/setup/src/demo/resources/demo/rules/smartcity/Markthal.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/Markthal.jsonrename to setup/src/demo/resources/demo/rules/smartcity/Markthal.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.json b/setup/src/demo/resources/demo/rules/smartcity/MarkthalChargersInUse.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.jsonrename to setup/src/demo/resources/demo/rules/smartcity/MarkthalChargersInUse.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json b/setup/src/demo/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.jsonrename to setup/src/demo/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.json b/setup/src/demo/resources/demo/rules/smartcity/OnsParkDimLightWinds.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.jsonrename to setup/src/demo/resources/demo/rules/smartcity/OnsParkDimLightWinds.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/ParkingFull.json b/setup/src/demo/resources/demo/rules/smartcity/ParkingFull.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/ParkingFull.jsonrename to setup/src/demo/resources/demo/rules/smartcity/ParkingFull.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow b/setup/src/demo/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flowsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flowrename to setup/src/demo/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flowdiff --git a/setup/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.json b/setup/src/demo/resources/demo/rules/smartcity/RotterdamBatteryUse.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.jsonrename to setup/src/demo/resources/demo/rules/smartcity/RotterdamBatteryUse.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flow b/setup/src/demo/resources/demo/rules/smartcity/RotterdamPowerBalance.flowsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flowrename to setup/src/demo/resources/demo/rules/smartcity/RotterdamPowerBalance.flowdiff --git a/setup/src/main/resources/demo/rules/smartcity/StationCrowded.json b/setup/src/demo/resources/demo/rules/smartcity/StationCrowded.jsonsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/StationCrowded.jsonrename to setup/src/demo/resources/demo/rules/smartcity/StationCrowded.jsondiff --git a/setup/src/main/resources/demo/rules/smartcity/TotalPowerConsumption.flow b/setup/src/demo/resources/demo/rules/smartcity/TotalPowerConsumption.flowsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/TotalPowerConsumption.flowrename to setup/src/demo/resources/demo/rules/smartcity/TotalPowerConsumption.flowdiff --git a/setup/src/main/resources/demo/rules/smartcity/TotalSolarProduction.flow b/setup/src/demo/resources/demo/rules/smartcity/TotalSolarProduction.flowsimilarity index 100%rename from setup/src/main/resources/demo/rules/smartcity/TotalSolarProduction.flowrename to setup/src/demo/resources/demo/rules/smartcity/TotalSolarProduction.flowdiff --git a/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java b/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.javasimilarity index 94%rename from test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.javarename to setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.javaindex 43f36b26f..07ef85c7a 100644--- a/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java+++ b/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.setup;+package org.openremote.setup.integration;import org.openremote.container.util.UniqueIdentifierGenerator;import org.openremote.manager.security.ManagerIdentityProvider;@@ -78,13 +78,13 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {realmEnergy = createRealm("energy", "Energy Test", true);// Don't allow demo users to write assets- ClientRole[] demoUserRoles = Arrays.stream(REGULAR_USER_ROLES)+ ClientRole[] noWriteAccess = Arrays.stream(REGULAR_USER_ROLES).filter(clientRole -> clientRole != ClientRole.WRITE_ASSETS).toArray(ClientRole[]::new);// Users- User testuser1 = createUser(MASTER_REALM, "testuser1", "testuser1", "DemoMaster", "DemoLast", null, true, container.isDevMode() ? REGULAR_USER_ROLES : demoUserRoles);+ User testuser1 = createUser(MASTER_REALM, "testuser1", "testuser1", "DemoMaster", "DemoLast", null, true, REGULAR_USER_ROLES);this.testuser1Id = testuser1.getId();keycloakProvider.updateUserRoles(MASTER_REALM, testuser1Id, "account"); // Remove all roles for account clientUser testuser2 = createUser(realmBuilding.getName(), "testuser2", "testuser2", "DemoA2", "DemoLast", "[email protected]", true, false, true, new ClientRole[] {@@ -94,13 +94,13 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {});this.testuser2Id = testuser2.getId();keycloakProvider.updateUserRoles(realmBuilding.getName(), testuser2Id, "account"); // Remove all roles for account client- User testuser3 = createUser(realmBuilding.getName(), "testuser3", "testuser3", "DemoA3", "DemoLast", "[email protected]", true, true, false, container.isDevMode() ? REGULAR_USER_ROLES : demoUserRoles);+ User testuser3 = createUser(realmBuilding.getName(), "testuser3", "testuser3", "DemoA3", "DemoLast", "[email protected]", true, true, false, REGULAR_USER_ROLES);this.testuser3Id = testuser3.getId();keycloakProvider.updateUserRoles(realmBuilding.getName(), testuser3Id, "account"); // Remove all roles for account client- User buildingUser = createUser(realmBuilding.getName(), "building", "building", "Building", "User", "[email protected]", true, demoUserRoles);+ User buildingUser = createUser(realmBuilding.getName(), "building", "building", "Building", "User", "[email protected]", true, noWriteAccess);this.buildingUserId = buildingUser.getId();keycloakProvider.updateUserRoles(realmBuilding.getName(), buildingUserId, "account"); // Remove all roles for account client- User smartCityUser = createUser(realmCity.getName(), "smartcity", "smartcity", "Smart", "City", null, true, demoUserRoles);+ User smartCityUser = createUser(realmCity.getName(), "smartcity", "smartcity", "Smart", "City", null, true, noWriteAccess);this.smartCityUserId = smartCityUser.getId();keycloakProvider.updateUserRoles(realmCity.getName(), smartCityUserId, "account"); // Remove all roles for account clientdiff --git a/test/src/test/java/org/openremote/test/setup/ManagerTestAgentSetup.java b/setup/src/integration/java/org/openremote/setup/integration/ManagerTestAgentSetup.javasimilarity index 98%rename from test/src/test/java/org/openremote/test/setup/ManagerTestAgentSetup.javarename to setup/src/integration/java/org/openremote/setup/integration/ManagerTestAgentSetup.javaindex 668f971f4..9c893d201 100644--- a/test/src/test/java/org/openremote/test/setup/ManagerTestAgentSetup.java+++ b/setup/src/integration/java/org/openremote/setup/integration/ManagerTestAgentSetup.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.setup;+package org.openremote.setup.integration;import org.openremote.agent.protocol.knx.KNXAgent;import org.openremote.agent.protocol.velbus.VelbusTCPAgent;diff --git a/test/src/test/java/org/openremote/test/setup/ManagerTestSetup.java b/setup/src/integration/java/org/openremote/setup/integration/ManagerTestSetup.javasimilarity index 99%rename from test/src/test/java/org/openremote/test/setup/ManagerTestSetup.javarename to setup/src/integration/java/org/openremote/setup/integration/ManagerTestSetup.javaindex ba4048edd..f4c7ce0d2 100644--- a/test/src/test/java/org/openremote/test/setup/ManagerTestSetup.java+++ b/setup/src/integration/java/org/openremote/setup/integration/ManagerTestSetup.java@@ -17,13 +17,12 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.setup;+package org.openremote.setup.integration;import com.fasterxml.jackson.databind.node.ObjectNode;import org.openremote.agent.protocol.simulator.SimulatorAgent;import org.openremote.agent.protocol.simulator.SimulatorAgentLink;import org.openremote.container.util.UniqueIdentifierGenerator;-import org.openremote.manager.security.ManagerIdentityProvider;import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Constants;import org.openremote.model.Container;diff --git a/test/src/test/java/org/openremote/test/setup/TestSetupTasks.java b/setup/src/integration/java/org/openremote/setup/integration/TestSetupTasks.javasimilarity index 97%rename from test/src/test/java/org/openremote/test/setup/TestSetupTasks.javarename to setup/src/integration/java/org/openremote/setup/integration/TestSetupTasks.javaindex 0c87d366f..286003112 100644--- a/test/src/test/java/org/openremote/test/setup/TestSetupTasks.java+++ b/setup/src/integration/java/org/openremote/setup/integration/TestSetupTasks.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.setup;+package org.openremote.setup.integration;import org.openremote.model.Container;import org.openremote.model.setup.Setup;diff --git a/test/src/test/java/org/openremote/test/model/TestAssetModelProvider.java b/setup/src/integration/java/org/openremote/setup/integration/model/TestAssetModelProvider.javasimilarity index 97%rename from test/src/test/java/org/openremote/test/model/TestAssetModelProvider.javarename to setup/src/integration/java/org/openremote/setup/integration/model/TestAssetModelProvider.javaindex 0c82338d9..6194df9d2 100644--- a/test/src/test/java/org/openremote/test/model/TestAssetModelProvider.java+++ b/setup/src/integration/java/org/openremote/setup/integration/model/TestAssetModelProvider.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.model;+package org.openremote.setup.integration.model;import org.openremote.model.AssetModelProvider;import org.openremote.model.asset.Asset;diff --git a/test/src/test/java/org/openremote/test/protocol/MockAgent.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgent.javasimilarity index 97%rename from test/src/test/java/org/openremote/test/protocol/MockAgent.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgent.javaindex b6810ad95..2a7072db1 100644--- a/test/src/test/java/org/openremote/test/protocol/MockAgent.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgent.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol;+package org.openremote.setup.integration.protocol;import org.openremote.model.asset.agent.Agent;import org.openremote.model.asset.agent.AgentDescriptor;diff --git a/test/src/test/java/org/openremote/test/protocol/MockAgentLink.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgentLink.javasimilarity index 96%rename from test/src/test/java/org/openremote/test/protocol/MockAgentLink.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgentLink.javaindex 196ac4a6f..56592274c 100644--- a/test/src/test/java/org/openremote/test/protocol/MockAgentLink.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgentLink.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol;+package org.openremote.setup.integration.protocol;import org.openremote.model.asset.agent.AgentLink;diff --git a/test/src/test/java/org/openremote/test/protocol/MockProtocol.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/MockProtocol.javasimilarity index 99%rename from test/src/test/java/org/openremote/test/protocol/MockProtocol.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/MockProtocol.javaindex e03b35021..48a78d264 100644--- a/test/src/test/java/org/openremote/test/protocol/MockProtocol.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/MockProtocol.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol;+package org.openremote.setup.integration.protocol;import org.openremote.agent.protocol.AbstractProtocol;import org.openremote.model.Container;diff --git a/test/src/test/java/org/openremote/test/protocol/http/HTTPServerTestAgent.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/HTTPServerTestAgent.javasimilarity index 96%rename from test/src/test/java/org/openremote/test/protocol/http/HTTPServerTestAgent.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/http/HTTPServerTestAgent.javaindex 5ddf1b76f..c0d382a4e 100644--- a/test/src/test/java/org/openremote/test/protocol/http/HTTPServerTestAgent.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/HTTPServerTestAgent.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol.http;+package org.openremote.setup.integration.protocol.http;import org.openremote.agent.protocol.http.AbstractHTTPServerAgent;import org.openremote.model.asset.agent.AgentDescriptor;diff --git a/test/src/test/java/org/openremote/test/protocol/http/TestHTTPServerProtocol.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestHTTPServerProtocol.javasimilarity index 97%rename from test/src/test/java/org/openremote/test/protocol/http/TestHTTPServerProtocol.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestHTTPServerProtocol.javaindex f3415c10d..9b8078be8 100644--- a/test/src/test/java/org/openremote/test/protocol/http/TestHTTPServerProtocol.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestHTTPServerProtocol.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol.http;+package org.openremote.setup.integration.protocol.http;import org.openremote.agent.protocol.http.AbstractHTTPServerProtocol;import org.openremote.model.asset.agent.DefaultAgentLink;diff --git a/test/src/test/java/org/openremote/test/protocol/http/TestResource.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResource.javasimilarity index 95%rename from test/src/test/java/org/openremote/test/protocol/http/TestResource.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResource.javaindex b76ede00e..6c8a01731 100644--- a/test/src/test/java/org/openremote/test/protocol/http/TestResource.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResource.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol.http;+package org.openremote.setup.integration.protocol.http;import org.openremote.model.Constants;import org.openremote.model.asset.Asset;diff --git a/test/src/test/java/org/openremote/test/protocol/http/TestResourceImpl.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResourceImpl.javasimilarity index 95%rename from test/src/test/java/org/openremote/test/protocol/http/TestResourceImpl.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResourceImpl.javaindex e354fc9af..34661b030 100644--- a/test/src/test/java/org/openremote/test/protocol/http/TestResourceImpl.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResourceImpl.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol.http;+package org.openremote.setup.integration.protocol.http;import org.openremote.model.asset.Asset;diff --git a/test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusAgent.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusAgent.javasimilarity index 96%rename from test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusAgent.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusAgent.javaindex c869236b1..ab70c7785 100644--- a/test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusAgent.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusAgent.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol.velbus;+package org.openremote.setup.integration.protocol.velbus;import org.openremote.agent.protocol.velbus.VelbusAgent;import org.openremote.agent.protocol.velbus.VelbusAgentLink;diff --git a/test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusClient.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusClient.javasimilarity index 97%rename from test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusClient.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusClient.javaindex 7833874bd..015f8cbcc 100644--- a/test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusClient.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusClient.java@@ -17,10 +17,9 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol.velbus;+package org.openremote.setup.integration.protocol.velbus;import io.netty.channel.ChannelHandler;-import org.openremote.agent.protocol.io.IOClient;import org.openremote.agent.protocol.io.NettyIOClient;import org.openremote.agent.protocol.velbus.VelbusPacket;import org.openremote.model.asset.agent.ConnectionStatus;diff --git a/test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusProtocol.javasimilarity index 96%rename from test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.javarename to setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusProtocol.javaindex 01f8029fb..5f586f6f1 100644--- a/test/src/test/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusProtocol.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.test.protocol.velbus;+package org.openremote.setup.integration.protocol.velbus;import org.openremote.agent.protocol.io.IOClient;import org.openremote.agent.protocol.velbus.AbstractVelbusProtocol;diff --git a/setup/src/integration/resources/META-INF/services/org.openremote.model.AssetModelProvider b/setup/src/integration/resources/META-INF/services/org.openremote.model.AssetModelProvidernew file mode 100644index 000000000..84896c32c--- /dev/null+++ b/setup/src/integration/resources/META-INF/services/org.openremote.model.AssetModelProvider@@ -0,0 +1 @@+org.openremote.setup.integration.model.TestAssetModelProviderdiff --git a/setup/src/integration/resources/META-INF/services/org.openremote.model.setup.SetupTasks b/setup/src/integration/resources/META-INF/services/org.openremote.model.setup.SetupTasksnew file mode 100644index 000000000..8b47560fd--- /dev/null+++ b/setup/src/integration/resources/META-INF/services/org.openremote.model.setup.SetupTasks@@ -0,0 +1 @@+org.openremote.setup.integration.TestSetupTasksdiff --git a/setup/src/load1/java/org/openremote/setup/load1/KeycloakSetup.java b/setup/src/load1/java/org/openremote/setup/load1/KeycloakSetup.javanew file mode 100644index 000000000..4cd18ff7b--- /dev/null+++ b/setup/src/load1/java/org/openremote/setup/load1/KeycloakSetup.java@@ -0,0 +1,57 @@+/*+ * Copyright 2022, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.setup.load1;++import org.openremote.manager.setup.AbstractKeycloakSetup;+import org.openremote.model.Constants;+import org.openremote.model.Container;+import org.openremote.model.security.User;++import java.util.List;+import java.util.stream.Collectors;+import java.util.stream.IntStream;++public class KeycloakSetup extends AbstractKeycloakSetup {++ /**+ * A semicolon separated list of realm:count indicating number of regular users to create in the specified realm.+ * Realms will be created automatically+ */+ public static final String REGULAR_USERS = "REGULAR_USERS";+ public static final String REGULAR_USERS_DEFAULT = "master:10";+ /**+ * A semicolon separated list of realm:count indicating number of service users to create in the specified realm.+ * Realms will be created automatically.+ */+ public static final String SERVICE_USERS = "SERVICE_USERS";+ public List<User> users;++ public KeycloakSetup(Container container) {+ super(container);+ }++ @Override+ public void onStart() throws Exception {+ // Create 10 users+ users = IntStream.rangeClosed(1, 10).mapToObj(i ->+ createUser(Constants.MASTER_REALM, "user" + i, "user" + i, "User " + i, "", "user" + i + "@openremote.local", true, REGULAR_USER_ROLES)+ ).collect(Collectors.toList());+ }+}diff --git a/setup/src/load1/java/org/openremote/setup/load1/ManagerSetup.java b/setup/src/load1/java/org/openremote/setup/load1/ManagerSetup.javanew file mode 100644index 000000000..9cd0a159c--- /dev/null+++ b/setup/src/load1/java/org/openremote/setup/load1/ManagerSetup.java@@ -0,0 +1,92 @@+/*+ * Copyright 2022, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.setup.load1;+++import org.apache.commons.io.IOUtils;+import org.openremote.manager.provisioning.ProvisioningService;+import org.openremote.model.Container;+import org.openremote.model.asset.impl.WeatherAsset;+import org.openremote.model.attribute.Attribute;+import org.openremote.model.attribute.MetaItem;+import org.openremote.model.provisioning.X509ProvisioningConfig;+import org.openremote.model.provisioning.X509ProvisioningData;+import org.openremote.model.security.ClientRole;+import org.openremote.model.util.ValueUtil;+import org.openremote.model.value.MetaItemType;++import java.io.InputStream;+import java.nio.charset.StandardCharsets;++import static org.openremote.manager.provisioning.UserAssetProvisioningMQTTHandler.UNIQUE_ID_PLACEHOLDER;+import static org.openremote.model.value.ValueType.NUMBER;++public class ManagerSetup extends org.openremote.manager.setup.ManagerSetup {++ protected ProvisioningService provisioningService;++ public ManagerSetup(Container container) {+ super(container);+ provisioningService = container.getService(ProvisioningService.class);+ }++ @SuppressWarnings("ConstantConditions")+ @Override+ public void onStart() throws Exception {++ String caCert;+ WeatherAsset templateAsset = new WeatherAsset(UNIQUE_ID_PLACEHOLDER).addAttributes(+ new Attribute<>("calculated", NUMBER).addMeta(+ new MetaItem<>(MetaItemType.ACCESS_RESTRICTED_READ),+ new MetaItem<>(MetaItemType.ACCESS_RESTRICTED_WRITE)+ )+ );++ try (InputStream inputStream = getClass().getResourceAsStream("/org/openremote/setup/load1/ca.pem")) {+ caCert = IOUtils.toString(inputStream, StandardCharsets.UTF_8);+ }++ templateAsset.getAttribute(WeatherAsset.RAINFALL).ifPresent(attr -> attr.addMeta(+ new MetaItem<>(MetaItemType.ACCESS_RESTRICTED_READ),+ new MetaItem<>(MetaItemType.ACCESS_RESTRICTED_WRITE),+ new MetaItem<>(MetaItemType.RULE_STATE)+ ));+ templateAsset.getAttribute(WeatherAsset.TEMPERATURE).ifPresent(attr -> attr.addMeta(+ new MetaItem<>(MetaItemType.ACCESS_RESTRICTED_READ),+ new MetaItem<>(MetaItemType.ACCESS_RESTRICTED_WRITE),+ new MetaItem<>(MetaItemType.RULE_STATE)+ ));++ X509ProvisioningConfig provisioningConfig = new X509ProvisioningConfig("OEM Device",+ new X509ProvisioningData()+ .setCACertPEM(caCert)+ ).setAssetTemplate(+ ValueUtil.asJSON(templateAsset).orElse("")+ ).setRealm("master")+ .setRestrictedUser(true)+ .setUserRoles(new ClientRole[] {+ ClientRole.WRITE_ASSETS,+ ClientRole.WRITE_ATTRIBUTES,+ ClientRole.READ_ASSETS+ });++ provisioningConfig = provisioningService.merge(provisioningConfig);+ }+}diff --git a/setup/src/load1/java/org/openremote/setup/load1/SetupTasks.java b/setup/src/load1/java/org/openremote/setup/load1/SetupTasks.javanew file mode 100644index 000000000..8f0a4088e--- /dev/null+++ b/setup/src/load1/java/org/openremote/setup/load1/SetupTasks.java@@ -0,0 +1,37 @@+/*+ * Copyright 2022, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.setup.load1;++import org.openremote.model.Container;+import org.openremote.model.setup.Setup;++import java.util.Arrays;+import java.util.List;++public class SetupTasks implements org.openremote.model.setup.SetupTasks {++ @Override+ public List<Setup> createTasks(Container container, String setupType, boolean keycloakEnabled) {+ return Arrays.asList(+ new KeycloakSetup(container),+ new ManagerSetup(container)+ );+ }+}diff --git a/setup/src/load1/resources/META-INF/services/org.openremote.model.setup.SetupTasks b/setup/src/load1/resources/META-INF/services/org.openremote.model.setup.SetupTasksnew file mode 100644index 000000000..6e28ff871--- /dev/null+++ b/setup/src/load1/resources/META-INF/services/org.openremote.model.setup.SetupTasks@@ -0,0 +1 @@+org.openremote.setup.load1.SetupTasksdiff --git a/setup/src/load1/resources/org/openremote/setup/load1/ca.key b/setup/src/load1/resources/org/openremote/setup/load1/ca.keynew file mode 100644index 000000000..f72dc6e88--- /dev/null+++ b/setup/src/load1/resources/org/openremote/setup/load1/ca.key@@ -0,0 +1,51 @@+-----BEGIN RSA PRIVATE KEY-----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-----END RSA PRIVATE KEY-----diff --git a/test/src/test/resources/org/openremote/test/provisioning/ca_long.pem b/setup/src/load1/resources/org/openremote/setup/load1/ca.pemsimilarity index 100%rename from test/src/test/resources/org/openremote/test/provisioning/ca_long.pemrename to setup/src/load1/resources/org/openremote/setup/load1/ca.pemdiff --git a/test/build.gradle b/test/build.gradleindex b49ffd3fc..151db0385 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -13,15 +13,16 @@ apply plugin: "signing"dependencies {+ testImplementation resolveProject(":setup").sourceSets.integration.outputapi resolveProject(":manager")- implementation "org.codehaus.groovy:groovy:$groovyVersion"+ testFixturesImplementation "org.codehaus.groovy:groovy:$groovyVersion"testFixturesApi platform("org.spockframework:spock-bom:$spockVersion")testFixturesApi 'org.spockframework:spock-core'// optional dependencies for using Spock- testRuntimeOnly "net.bytebuddy:byte-buddy:$byteBuddyVersion" // allows mocking of classes (in addition to interfaces)- testRuntimeOnly "org.objenesis:objenesis:$objenesisVersion" // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)+ testFixturesRuntimeOnly "net.bytebuddy:byte-buddy:$byteBuddyVersion" // allows mocking of classes (in addition to interfaces)+ testFixturesRuntimeOnly "org.objenesis:objenesis:$objenesisVersion" // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)testImplementation("com.github.calimero:calimero-server:$calimeroVersion") {// Libraries should not depend on a logging implementation and/or alpha versions!diff --git a/test/load1/complex_yaml_script.yml b/test/load1/complex_yaml_script.ymlnew file mode 100644index 000000000..ea34a55dd--- /dev/null+++ b/test/load1/complex_yaml_script.yml@@ -0,0 +1,56 @@+execution:+- concurrency: 250+ throughput: 500+ ramp-up: 3ms+ hold-for: 1h+ steps: 5+ scenario: blazemeter-recording++scenarios:+ blazemeter-recording:+ timeout: 5s+ retrieve-resources: false+ store-cache: false+ store-cookie: false+ default-address: http://blazedemo.com+ headers:+ User-Agent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36'+ Accept-Language: 'ru-RU,ru;q=0.8,en-US;q=0.6,en;q=0.4'+ Accept-Encoding: 'gzip, deflate, sdch'+ Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp'+ requests:+ - /index.php+ - url: '/reserve.php'+ method: POST+ headers:+ Content-Type: application/x-www-form-urlencoded+ body:+ fromPort: Boston+ toPort: London+ - url: '/purchase.php'+ method: POST+ headers:+ Content-Type: application/x-www-form-urlencoded+ body:+ airline: United Airlines+ flight: '234'+ fromPort: Boston+ price: '432.98'+ toPort: London+ - url: '/confirmation.php'+ method: POST+ label: '/confirmation.php'+ headers:+ Content-Type: application/x-www-form-urlencoded+ body:+ address: test+ cardType: visa+ city: test+ creditCardNumber: test+ inputName: test+ nameOnCard: ettest+ rememberMe: 'on'+ state: test+ zipCode: test+ - /index.php+ - /vacation.html\ No newline at end of filediff --git a/test/load1/devices.csv b/test/load1/devices.csvnew file mode 100644index 000000000..83fbb01ac--- /dev/null+++ b/test/load1/devices.csv@@ -0,0 +1,10 @@+device1,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECraMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTExWhcNMjQwMzA4MTMzNTExWjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL3aC2do\nRh0U5OvxfFMgmwp6Y7itfv6uE8d0KU18PBsh+rxwcsqlesW/i/q3+ZFa8L/Q6Zuj\n8X3JmALYK3H917arNIz59WVr7cwrWkON9AJHhFMlip1YiN8mudF9IVRa1WQpVmJa\nubR4NgtFhOrSYS2wkFDQZ2VJ7aNYE54k8HVSOGFo6izHHG979X2JBu5xNP9xSHwr\nXV17IEzEVQ/78tIV6vRjliQ0s9nzsFmR5D5n6A53Mi2d9+PyAHUAIlakeKmoIj3c\nYZUy2IKBARVNzatW86arMZwb3SwFlB5ceZHN+syK+QGGmW7ofQT1DLYsmXIINapV\n4dBrAOn4KzusNWzmBBguIP4ondZG7/hcawcJEE+6yzhLcpk0JuEwlgOG+7FUTQtS\nhzkRM/CEf/A75KD2xG3ARDXs7UROicHf1flmqCDT2lutMxBetqQls8BWRnt/S+PK\n105gLoXZ+7tOyJmQlf8IYzRziEqet2559Of9XcvsRX+01AJvSCSftQwaihYZE82P\neg8Uk2Y5XOq9N+y/T11IhfsQsdItV8srVvn7uQzgGvx4642eLwPRKzWdMtii5rnA\nJk/2TTzmWw1IgdB7GizekyRUh9GVPNh8Ks1Ue8vZjdAlv0qEg6cObLUPjXG4XiZ1\nyKnT6hH8t/16/UkEG9U5roLeE112FDODNgdvAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBADHYwEqs3b5P3fpIp1rYVYf5mdiLZnMUsj9gDEtF74Wb/gITt5md3gp4LSU2\n43z+zbXS+52cz7gQouHzOf25nq/mMKSxjGyUCXSgBjcD4kCyADflWFOF4+ZQcyBy\nGbfmyj97cU/5N35xLDU7lb+knRaKIiGzyNt6Y0lXMcPULZe5fOdRJ3i+1Wne5U7g\nglnax9wkAPZhM0b/vzlqQ54vHUWbma1fQNkEh6EvjSMrwCfNW9FvzalFE9OMrt3r\nNoSBDsvVpxi7824Ot23/CugriOcLdU9Z6BbsHkV2E7abdkHRWsI8fsAZI6e1WbWo\n4bUpyvg3bcQVdIPS4zw5z4LV5zl8+6n+odPFWXlf8B+4HmCstPIiqr8XavgDWHhb\n81fCGzFx4iYjxKpM3Dy0VHp0E7fjnXIMi+3+WU6CiQgbksClfh+g2xJ6mQ3eAqxx\niMwblqbVDOXtCNPCdSFtvPTpt5nfrGdSb2Jt9eYUbVuafHEAkWAeNedIjIjcspJs\nakA9T1/p5rjMtpPmxk0lZw6LJOJaZ/6g9+eASgWN6j8zXcwF2gQfQCSY+QukydNi\njujeaDyp1fWnDDBe65V61tHziAOXiLyH4VpF+pfSEoObPPDLziZu84Lm/rv2Adak\nxaJlTcM/g3QgIoMWxVglYfvRpNDS6mGAX1nf/15ylQIwViP1\n-----END CERTIFICATE-----\n+device2,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrbMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTEyWhcNMjQwMzA4MTMzNTEyWjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMx0rpVW\n0BkmpI26Z/UeXHFqnojcW1M3SwtlouFT0pxAwLdrpoGsWeWO5jDYIndc1LPhaGrf\n5V1xhz9tbdaeFRWVAWg/CUbVR/jS09Y1HFQoELmj06TeOHW53S0x4FMkk5EKnOvi\n8NEC4y7A9MXhSf+tTJBjrY91FQalU5Vo7bnG0XNsIGGW5k23qRhx4K7u8NMip1OH\nWp0tO0HhmxnlajT4Vml7MngUiMpDj/kr4OXYuAvkPGw9DC9yWWy8CBUKkSDxeFui\nPVk1qqp4g8SpUkc4n53D1ta9C3nraoP+5me+C0NVWFrBiAxZ9Q93LgOhdPLJY3GT\nmyVVXgjKfwuOTsgtlEhdZJb98m5rXLZpM8IotlEBv1FBRT/GKhX1VrdmAHm6RApU\nsVLIs0Vkhz3XkWVaH8vND4YRSfIT/0Gk09xofo8j3yNMpOAw3Dx7hoiRXehPYWS5\nAJSCqNvL2INFNGvpVi4aovEeKyHgVnNACKP1T/zBUQs+rG2l9fY1fxhl5xJ44sup\nbj+i9Wnrvonmqqnt/vngh59r2uuXQQfU3MfmTnCeL5DsY7J6mX/GJKN6qNgXCJ4b\nQKb47wpKhrrJULNuDo8mIhI3Ik35kFeZ1CMrzv852PdSFjBY8+Jc+dFT0hC8rHyL\nIevDDCm9VNRYkEHe6iLfqXKK6kiD2Hr2E81PAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAHwnTd9tvJPa4R6N5gKaOxYC3yxiPMO6K8UFlWHDQCAB68dUHV7tSMY5IElT\n9+XglXPW4K7+UHbZZol/SQmk2MFgNrOHwaFyiLl3+9YcDAAfl2j1Q6iKI/sIxoet\nCAlewPCa1gbyol1639zrsi/S4UYYy3qEeArRP+Z4IdcvnT03dzo7JMk+JOANC4x1\nIKgrUinYVINt7Xt56Hv5ey+jUMU4sa5c5KQ3v7CDlu7YbLgQq+/Z35mhxDLJJRdl\nLfNHfKkeQRk3t96wYpncIlTTdJnCHNDJk+nEglnEliNsC24giNYJ0OOw/Jg8hQCJ\nBlirP3vWcVurvnvSU/aykV3GdZ6qEkf1LQT1b/StL69XHRkaVxBHI/IOcmxRITy+\nKjpfFsPR1EqxH3V/m83r6FMM34swTCnwSKGCwSXI9Kaz5HoOwAB6xlcj+xzTmMZ3\nXTUo4T7g+7tHamQ6QXbIsFt/YJNjOk1Mhn5V9ZeuJZHdfiAmzg9H3R0uwf2/cUrt\nlzSvWZb12av54ChMCI2hH30sjvsLPVDvb+EIOXrH+GED0GqgRXCjB5sa9rIUkQ1d\nbJ53BIwsUq9JiMkDsD92Q00MkIPalJniVXpLAXsFzfP3cgA8IrbvxhhzHCSChbst\nJ0Lnd4i4rs9HdjAYRu6ZUYskbNN9Oqr+gy05cfq8KeV5+SpP\n-----END CERTIFICATE-----\n+device3,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrcMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTEzWhcNMjQwMzA4MTMzNTEzWjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN0ovdr6\ntLvedO3BIspvCwhk05F1ke8qNSuztKbShNbnC2olZSv6e/qlliSqS80CMNTza3b5\npnw4NveJ/2Xv+cZxvWHqTMQFIkSSaixPGpjN4Shs7TE0lfYiqjl+NOMolpSETztJ\nS/tvdKpZyefFPDtw19jdjh43bUoipIw0H75KtAxVA8uQvBYaDwzX5B2NzNyGVH7p\ncafyHxDBBsxdWNpxkixS8vgCIuO4bBZy21eH2+MTqm9Xl7+z20bWtfihJlLY+WQ2\nXBBqCt0u+8N51dffF/Oq/g5gUc1/OybhDVQLaw4Vkkwe10VDdskwBG38hoP2jKuf\nysv5j0TsC6QmQ2nq/MbD2rZZfaRl3pZYkobZTR/Vbur0UWjc+0T+x6JkDLROJkVH\nDdfqIxBT5Z3/WcLPszdrf0AwSX3SDjjckRItnuEw6W7JBgoUTj1CEdv3RLrSq616\ngbZwwJ3EyoCHMazdGwjcTEU3WArAFSwp2iL6jG+CFn4YGvJlYy8XVJcR9hPfJmZM\nNiVCU4WbJv83cRjcZszm/+peW1TqW28iOx4P1PpjPcvAZ/oMDdPZzUkUBpV1XpbY\n6bjKugEk/UEAVWMX9yyx0tGeCEeZS/uF7bowWe6XbWd+ENMk3WQe3v09PtVOKX/5\n1A/9MqLft0AJ14r+BEQSk7tGT56D0AHAwP53AgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAHVsYNgt8BQsBLHZfH2+lLWxRnVhSZg/w7+ktU2TS3ZjRSqsESuU+P79H1ZC\nqX+xDkki+Nme5jMg6wWkUdq1/Cd0XmFo2Q8MrP82bY7dL9lkKKRWP8uz3P/fQk4g\nK4xGyly6r0oTECZPypO+lx6yh+/RY5MIVoI/4eo2X3ujs6KgsCWzB4a01Zp6ZgxL\nEomu2NwIgduDVxQfPGz991hbW0zsBWDkrIf7IVdWMm8/HQgm5xrNfj5fNzJepTvD\naBkGrZL4QTygMw3gUhnKGcZa1R1v6GCnowZBnRuah4/BfdIGv5YX6DdmQRaztFQp\n0ZCspMLwsFKymqbPV4Rc+TRAowYTzmOcdpWXaCz1iQRbrpYNFWefjh3SL554PHRm\nhqXgAGh+UiM6Nh0deBRNjoHhztlo8osdrnYvtO0sEX9B2fKDq91Z9cIm/H2Cnbrq\ndYrVLiEPsvqvgPOaLgm1t8GbzQXMg82iMHAcpC5WIh1W3eIsgZdn52qnIWn98Uni\nyfu5xoYwB7jzWnZp4FJcnqVvV0dfcGSTCKFnXhdQTtJEqtgmQv0QkORF9wH07oLN\nRfJGeXv94zyfijv4up96MO9mkKXHYk5uWXDLp3NxWx/KQuG13K+zAxyak2WAnvPr\nH3eZ2Psj0Gr49lTZEbNiSWdK1EfSmz0vSQEISIa9DOcclQSk\n-----END CERTIFICATE-----\n+device4,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrdMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTEzWhcNMjQwMzA4MTMzNTEzWjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlNDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANWQS4M4\nvvNAs+cTao7itamSBUTH27nFhqa4ON0Jmx6Zd5D2bbrfrczMcFK+2gGv/hJuBM0W\nuypEaozaEoizW+0+7POZWC7nQvUcE1pmtCnw635flIpY4n4eAgltSPYQ9zBu4j4P\nQ40UxZPVKThPK6eDc5FCdNdLMDg+wpenDPwPAYfpsM+6t3uYC8uOAxeT4Y9gNyUU\nR7iTTyxjnxf5WGfG8Juag2KL/2GxUYFWGs9Q4mmbJ5DV+owGI0N34GsNpRUkbvpe\nY61XBFoBkcA5Vvy3Lw8S9dCrlGYEkjJr2XzqF+ovZ4pRuMico5P83HYc6xTPTlEs\ngF5NyercJtWrg5mqyxUpiGinRtay/8tualq7sb/GFJIV+3aXnMzV8kui/z8lH6/M\nlUJwsQD93kt4+qu+iWyNhByABpnDX9GltOY0jbsAAfjjMCtg4YrH0gjSwtxi4fjc\nqARpeaSjjlZ6L8jNhRF7LRxNxI5u2QGKboGMGlJjmVAcK8yZhEUs0ALb7VJBhPWA\nD4zQx5KybJttKMQ0FisrhbhmFEolKfsonhxQBaiAPAJgPH2W6e54ee2+/klXpIQW\nadu/4ADg/Ik03rkT+9AM0VRYZu/48IkBKobRNSmxjwPD6gF2DTvPwbnbx2IK/p0d\nQJnByduIuC0nAm2nanbd4vFO4eMs9rygx0tLAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAGyVd5vexRrxYoXE68WK25bW1cm6Fwn9VMDoxsoxyZfaMsY1RGXsujNiR8nY\nffH3DWdcmU8vkmXB4dwJ2P1D0Xqcl7OpO4hT7lJwMTitSQsMvcLH38CLD2Jed9vy\n3aJL532RoIIrJq+IN95mRVZFDXcTuGZOV8SGBc8JUjNN7QRc/YBNdOJOjCKUmK5h\n89uUGGeTRdgcXdiOYwce+jYVoy9RJpeWfFF307ghgfCgqN4vBvZBnZ62KCWlmCGD\nYy8su3XKfZKEqydDXFlN7pyCWnIBWlHhqvO2+4VbYL1y59Ap71tgNGpQXfaUVW99\noKxr+xAbGDsrUkGOhG7L0XLr0fgsvBJArFN23Oou38V6fR6vZryz0bei6zuYQYin\n4jMYcu70GeBkrpNvk5tX8KV38kfP9BNdOp5Wc9VPCmwtju13d6ywX3EqjlZb0TAZ\nP+kYY7EeWCQ5ltR4rdrobIIjCkveHY1pHcTXakGhJ2XhJh7+IgS9IGAx03enkYAK\nXDEu+LgX/DCilzAK4DL7p5p+VtDGGM2ojzZpCwK4cS1lddPigMJsXGuY72Hu5cIw\ny6uegmBaB4S4SaWXEzvOBxp8kY7z+RnrQd5Env5cE+izb3Al3F61kDElLUmv0hRV\nqjJlHfBiZ8ZXKT+lPv2V1BfWnJrh67hL3/a65W/LOkCKhatK\n-----END CERTIFICATE-----\n+device5,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECreMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE0WhcNMjQwMzA4MTMzNTE0WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlNTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANWs3GNL\nBizfdNwvt2UwnNoqPSJu26EAXiNL4//OQ+s7shHpmb866G+GBmw1a7cgjiB4L61e\n32xEsYJrFIJy/6jiROnf0O9A88ZHd7gBW4VoL3l6YyRkm8CJ+rItijPAHO15BgL5\nHq6pVOCPnQAb9gWoLbwZAT9Me3Dq5cn3W3gOz6XakTzH/yjnWEqOarg6+Uh1PtGf\nokv0jOEnMEifZAMWUAZJnCcoyeqPx38HxNm0To6ohsQNh4Vt/HHNbw5lu6YELCO7\nGlm8xQpbKGgp/HFHokqAwImlWwwBvVScWw4GhAWsRjicIRetE3KNodH6GGy9uVwr\nrLfi2wfoAk5CxXTZK0FnQM2zepaQuW4SSWKIjli+8rrpP+/CTsqMFMkrlIZWYa+Q\nNViOdQuVKcptAp/BTzx3nbyyoy6Vt+nLAK8CpT0VmHENGUqF1w6I7+HUz+vbbRAZ\ntiUj4o//Ppj9DajwDq4DMeJGVEo/e1nu9VdKiBXSh+KrOFZ8ytI+WPTJcq2ET9/0\nAmTNGSYuZlo/NtlYHDozQaBc2R0KgJ6tk6qAj5Yn4p5N4fbDQ4tH0QGfOTvT94Al\nVDb3XMs3UKZQbH0/OGA9stdY3gc+/M31wYCJqy3KBnR0wBubz0y2nozhAyJ5tnQ/\n581BBnyw5Zh8aQzG2x2HIV9oPrhiDy3rbjkzAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAJTKfS63xBjUP2vU0SWRDlkthMPvqUIRQ88BUs/PLAbJjuI2iK8Wt5W1+JY2\nKj4Q5Db2mZTAHwJxT5xCRdHG8YjY51/zLyuvU49MVeugfz4zVesU05y+yqn/vrJ+\niVsShGARo8J8Wwvr+gqdM0tKPS/tQ4lfUOvAoj85z+1+X5WJECUVyFI6xhDDSoU7\ngF2zoa1dUAu52m6+mwfu/ynU3sQcJkuWsG+4oKBQFdWCyVNhbxC1J6LnUHUiIW+j\nac0BX9GmnqGCjdIxa89FtaSVfwpiFsGfclIHGp9h4axGjd6z15IBhngQgj955rAv\nIfAI0BhPkxRubdvnFG7Nr7fDunqfxFd5BRkajOkECb6aBjM1Rbnq+ZXFHElSi3AU\n9/e4PyqekP5wWU+aLbU6L0nfwH4CzDeMONmwodhJWdI3jeimyaom2Iz4x8i7RmqW\nb5rrf3MIEatd2OZleqx1EzRtku7jBh87OjdyvLEgwDOx6wuwzdIXK+uTqD2E2zlk\nkL/2XQhM4sgjeWYl/s9+EPDKa5H7bjKvRBmrOm3Burgmof8ja4QU79N5eL6VSR6R\nja6llSGTnyztoyjNV2a1fPWtS8ka16D1p4rwikLVmJ1dZs6IaR6g5QL6lli/Sgbb\nB7qB5ECJnleHLdjj4264gLdARrLHJbMMwbaJuvHKdpm9Aol1\n-----END CERTIFICATE-----\n+device6,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrfMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE1WhcNMjQwMzA4MTMzNTE1WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlNjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMFIyQjR\nkQEtDSGiTs4FCXRn9DL4X/4uQEUxO4/M8BkRAbAhLFWb1vr2vE9sDvGGdw3erE+k\nUS+an/g9r2/qDiXk1hh3D4CTnSMZIHT6w9Gj8F5kN6SXC5Zj88ELM0Afv99CExEu\nRr94xshjWp1Tzi8qdaDUZ4xjgq3UymNVeL5t7ov7uQme/3ljttqtcgLsIfuRUgR1\nVg7S0di/wb4N96Rvuok3LfimLOKV1Vqrlgb5hN23dvab7kLeEJ4HdHS1VRdHtLIy\n89AcgYyWU0v+mffKv1m8UpPLJkrCrsr7jnyi2zGtZ/O/KDW/h8nolVMyJYXtbC2K\ng7JmJt4dB3ddDSLBhynCQCulGMTiMLcY0YKQLpR5gQNxo19s6PHan2UL4wgWTytM\ngIo7dTGK/yxMz9/u+8q5qN78QuVRT3K5i5fm0JBrSHdCkPDJWc8hK5LalZthIDkj\nTU7DMkn6nYD+5lcZb0mmrlrdOeh0Pmf7aUztujW8Nd7LCqR3jO0xIjk+1wZwMliz\n+HM0X762/qLgTJC79Bnrbn+Jko9EdvlQ2OSeFKyIzIbg+t8VQg7KEFD+UmNb6oza\noTf4xQEaiHnd0fCJObXQgbGSLK5sli8pN1sL5TbV2W7BL4EDbSgBZc+yS5znz3q/\nYDbCFYbMUGCS446dyVUD0FgcnAHnAOljKzN5AgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAKPIb1M/oNP1ZhIy0RjHjZBqm/lhD1DB+bZO1cAudzcg1yaT+OC3BgKyHvYd\nfoOXSvX/RuPB2Nwd26wM82UB7P5a3h92LKLjWLgJDaYETmKNpl2Jbl3ujyAqXEr/\nTRZ+2BnEZs6+Zurcj0qh6OY57eVntci5u2xVW994fffKOHsAVXqRWjBB+mF2nPJx\nF5Y60t7p0s51DqffK8OCaTGsu0kvZcdTOIADPHumkzBGHO0qg5v87x5J+ZdZsE7G\n6As3wdNkitjNZpNxT3G6/FgshlQF0FAYZ+zhSmvRXeE+uuNxCsOzt6K8z1gcZ4V1\nbZvHSmSEOnGAchIA5hFCapg4QryqDP6bsRir69F4si+xVEvHul6koQEiZ7xpo3rf\ntRQNUl1Y6cwG/53i6K78Jztrq7PbxPKMZPNAYG+uTiGQq6bo1E5YwyPIFiG1yLM/\nI6E6BrwVqRA8LYFnSfXKAyj+5EWCoKgs5wTyXGqkhO1bsxd2qtkgXYpSJEVBwqt1\nv6q87bmBddXuXG0UTcUzwQ1Y63hl9cPaNc7tggd7XPqMSHsdsJj8HUW8OYz/TpLo\ntwPYt5tCDO1EHRsepmICiGLX1R1lYRlAVNOIt3Q3Cf1l4ffLeBZ1cUKDcluP6jCX\nOpYXDgfXplooHkNmY8Tf+REjQRzZ1Bie+OInOS+ZKXgBdPgN\n-----END CERTIFICATE-----\n+device7,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrgMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE2WhcNMjQwMzA4MTMzNTE2WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlNzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOiVRvlJ\nuK3fJ9Gn9xT/62WmHe2HbtnIqodqus/1bfL/A6wBvQ5yH1tZHuCMS9XWFP+sjw3p\n604dF+yIHD4rWU1sDzSyn9AY+KmMd5zhp+joet4BdqDIKDx40KZVrA7KEu0wqpNs\n2297wYUIG9ZhX7wwpAkrfEfNxzDzVibIOQowKYpaVH+mWbwuvbBzAQY4F9iZ+5kW\nBNVyjG186pDhRylDyv65uJa7/i3mSnyxA1gh5UNBcSQbnwTCum5XMkiKA5AIBGFb\nOi3cvIrarwiP2V7OZJO8PhYlj3CwT5/zWXvbYvRv+K4CruSRx/rb0JPOz/+buf/Y\nCKorf+c9K98DXUetSp6Bw/IpLF6+wG7cGAiPgHIyYkSCCp2ro3cTIm1+xjlv5WV+\n1IOTBI9pWwcGP+D71GJG8BTppfCaYumZ6Y3cnWP0KewLdjHS/EU3SAyAcSTI6Iba\nA4l5GmRbcbunL8QLr0qP6G333XXd8Vi3SBFJoFI0CwmatOsi+yYIe4m6o7K13TWP\nFY3ook430nMSr9cMAIjbK6kZZntl3P/TceGiIa3GBB/p7VHnZP5x5M18WEujuPlg\nOP3L69JltPmrX8CR0HOXiYomdVvg7RHjqXv25ZHU6jlYLIxu/SlsvZiMPVlXkgZ5\n0F+MOkpbDg1g+/7J0MetVkzst2SYCvl7u2VRAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAI5C2PjCTv4E92omZJm3uTt3suFgWrmcyMykwcAoVEpSxKXnuo1vuQoG0tw3\nrQTFA+HynFv2Wd+BJE9zFqnkVHKK7x1LIzqzlgEQQQDgFE1aLmf+mNIp3E5CQhgT\nXBukkfttLmypCOAeRhWKDey2VDr0djBGVjXEIb7pQ0eWtS0xn584yVukgJf/XPpv\njFcqRcyfhoWtHrKsHQvd4IIam+EpHs/wfRjvpfM+dFybEOhWDAtSfn1OUi2Zvyjw\n0Mh7V35PvwWmu7d+Z8m3+ArtohKrqk1f2tqSnLwrZEpoOQ90CvZKT9dONB1sVRiu\n+K+aClco/lcAefkX0AKQO6RobaIDjFk2g+4IIfCqUx2CUDkuyG0mWL4NlFK21h2E\njHOAq+xUQF4grQcB4jq7Jy+HuSrdya1ttMXaQmZSfgebZ2oWdf6UCK6Ffe1p/K4y\nMOdql4xS8mMMF2NUeSjGKF8ikQgqFUMAbum2DCDjgMzZYnyIdKQ24+5e6ZQrQuNi\nV0ZssGLyA1coJkG0rTimuOEBKTZfKsQMxu4sJyH6aiw9uiou9G5PKH5mg5Q+8/IZ\nYqc9S/A4V9+N+G+x9MbhNkpYyScaYf342Ve0lwgn2HP+zthH57U+Xda6zTGCHNUS\nM4WmZETKlRPPbJ+shQ3X4w5IxXKzrXhy6i0xFy6nmhrm8a2k\n-----END CERTIFICATE-----\n+device8,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrhMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE3WhcNMjQwMzA4MTMzNTE3WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALSnfHlW\n8VQQcuqOovg/ciypfvEYzqRiuVY+jYEeDIvCQ30nYhRYGhkq7D785QsGj9UxMX5B\n6h8XW90WBZLuG7OkYxAKYPPfN6IiTVFTxraRrNr9OA08eGCQuwLK1vlvPmTYC2Jn\nzObmZcFCAWp7c0vMFh3hdPl/dySr1kOrQY8XpSNP4ty2m6ttCIWyTgDakOcQaxN9\nCNNzPBJPZ41tKD5IYob3dqjk6GtzDBVdwd6tGixgtw62zbPgEVoBbGFPQ/xt7aqO\nlMYiDTKazyljRtkicNIO9VkEUkb8N6DYNL9K586sLdQl9RBbYNhxVPPsUPojeSJO\nYQOczZz5SLmZJknfdtGobDKHxju+0wZRm6OIpQuC3LuXXu744xmqoIlMdDDOAV93\nF5W2aL+bpbT5939veQ+qBc4nF2AqnmDTrzfdj35qI5k5UFVAO/B615b2TcVX8Mfs\nuaoP0lPIwwHw+qOxRRvEuZB6PavzXXsQyW76xSaVNwFxzgZHA3a8icwET4rdIVy1\nHgWd4OTY+uwWv+PfcuYeXSmHac66gEtH803zwbwbcKj6fJ3Eg57cN1hpYDpTXWIF\nKy4MczRmy4mlntRnjlA5gDRCujpcvm7d2fT5qXud1O9Voj2eaVgiPWeFTdaG9WOy\n9Wv3RaPc/5tOSbrSSUrnITJzIQ5hC0GOfWelAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAAOmMvP68lbcJ6/qzQWpqBwyW1UaVuxaqnvFwsoxmupxXjl8rKSfnfRn75uf\ncO4e8dd3wweSjqxS3gTuH3SQLaVDpQoEE4JBHTL1gKsC0g9uqeH49QzSuV0uEmaO\nLF+PLrWDJesRmuliNTljncNIG3nX0oEmkTedD/zabBu5hXRikaFk6ElSTxIe1lRU\nCTaUQbh1UbtrAREoybM6QzRBuPQLRplI1js+C02fUFuzr2is3jy8si8RHTZXCzdu\nBRsD1YUT84AHbMF/nX1aBS24Piem0C+iRFnQtDZCHzX8oSeOgapCHHWWMIxsHX04\njNQin1DJjX/OEQGDt2GA7qXgi0b48EVuSiKq26eIBwPqEgAbM0/4nKm4+qx69ygF\nrztnkO+hH+065/8w6mBet9LezfM31A/wpAAzwgkMJq24FAHfnrRAXBo6cWkgh5SD\nbZ62b5OIXgggFL04m/w0nwkNj9YEPnDpY+jxdrua9drFcIcSCIJ+xnMFhkM2rd5c\nRx48rOVzFgH7r2r+nOu2Vf2/Ftr9JjM+98QzYVO5bCTPR6bhClKSLKCRqOJLqJ7+\nlbkNXVr7AXXs/qOedBbl76WnvHBVpffB3ezF5PYzn3Dgi6+NrQ08YRSCyLHlDQWo\neW9ZSH3WeIg4WAvgvjQ0rXn6IToZ1t7gErZTiLI2/SE5j3Wv\n-----END CERTIFICATE-----\n+device9,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECriMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE4WhcNMjQwMzA4MTMzNTE4WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlOTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKzu5mH9\ncbuy6YS/Vu9Frp3f5cW72s/+dVuTzvEn2TMS2GgjIEHtdysTLUoEYwEBcpgn4Vyz\nq7CPiGTMSQbmhhyd1mvOwT5DBOOS3KRiuVLKe+G0oda9MKjo9NPu0lN6uBnkGLO9\n034ZdMknVDrPoT/inri268BgwBHUIHIA80CuD2L6CcITG5yqqBzbLpeOyIOpnmlm\nCUfZJ/FaAmq97igmKnAJ4my2MKHNJhj5m3dgyhRzo4mseg6uhczyAEz6aL7CjiLb\nvh84oxoF+hs050e+mOl5NGsgdmqC8pIG94rjli5DCO7pQISyipcrVQhzkp27Yjgx\n8ZmpSB4xRyKtIVcj4Y+shuE5XDRchkui4nsSwsAVz/DcSuen0TLb6GaKrYzUaCt2\n0LqyRf7Rtg/4QaNZBWkPbRQU+bJO4AU85J4iVirqtnGj5mdjktoLTh0RErPqWqYi\nBDIwrEhqtAi9qb7wDcTFBS73W6aei9+X3K7+NAFxBfrtjDhduTcD4hW9eh7YrmnR\nSLOK5dc6JFGAx74aKPt5DbfSavIsEhdHbG98F0hhv2qBxoWDI+t1PmtyGtL6rQC+\nyn7x3WloeNpaZjny8Qo2jXz19cuP3nH3xGH0yKS+7VZ3qBRk+DVgs08QekHK0Fiz\nKMJOtX2s5Zyxyc6cU+G8Toy5DbqcNJ03dYcRAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAFCpvy5HQxralTSpqMMoXfu+BRB9z6Sg+lt7c5laqQf12mlSaW7TFSKHEWN8\n5zlFGRqy4CztjEWACxTfdK9kqGaScoG99GC6vEPlR8P4JUJkIK4fdIi7FgnN1oXy\nv7ua2/bvo0a0xeeNva+SQ+UREbfqbiOnka9+S+A7LIrsL4+yy/0WMYcrrHSo35V2\n4agPM0j7QpQAhGo69YxOqmmOlHiIQprz+EHOPDswnIrLHElH3zMhegamJjtKSImi\nD5drZ2Ce8U0VGvAhZk8B4cpHDKzTmg7wePVyGBzWKlMtOwLiAXo1215iR1161znQ\nPz+s2bouBD31WRMA/04zgc1gac0+KQVTe8a2AHsn4D8l47mqgKD82h87siBHdyIR\nJFsuf//F3YPhOyK5+flnIGA0xjNjKe9q8QksNNUPsXRjLr+UskXS875S8kiOZdsX\nnFQl+veMJtu/JJ6ufWuu/TwmnhhoAaJ+DGnCc3c8YCxU+SK/hSjuRXGrPdvs+uwd\ndcD+4s1RQYdam/+zgUqS9RJrlIVd1UryNqNMbaXeF1zBij0W0WEAyYnIKN/6WO8q\nnLsZGW+fXce4I/I/+Ml7dUghPPQzNpPoBflepJHyEWQPo908CRCRNr47P9+vC1MB\n0WoJiM4RuyhUsuv+e/cVN5Z82nHSeU9lyr6+PkigFTX/v36l\n-----END CERTIFICATE-----\n+device10,-----BEGIN CERTIFICATE-----\nMIIFYTCCA0kCFAFINYMIOiLOII64AG+rMJ6/ECrjMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE5WhcNMjQwMzA4MTMzNTE5WjBNMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTERMA8GA1UE\nAwwIZGV2aWNlMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDDpWaI\nJSXgbJZxrE/fhBimS9DF8YBWY4RFj4KSDrQMgj4htSULuTmDHynXsfBX0a1UBUtS\nwlovgqY5EjI0jnTrKzELjBhraMkPVNH5SY66tBLeAIshl6sVS8Kq6Y+85itoITNS\nub2g3FPNDF/DIDwpE9XJuxaXD4ZZA2Ot+LV0zMJI2dEN7I367X0Gyo7i0rrqNU+a\n0W6UuHyd4TFz+h5OwrakzYYcPOkGK3ETrKHu5b9Za1nJ15sOQT398GwVzsEzIjGT\nEmfZ6YTSTX+uGe9+qsSh7MEvd4R3TbWksEPgxs1oYGTQ481ccyjZ3hxdkmhXNE5D\noYqUsbY9AzYVWkQkBjj5PPG4HxNuyyMSgELD8uu3S/P+ZU8j7g0Mv473B/vryd5+\nZmEzABQ13AljBMu8Y/fZGieW279EzP6tl1fFY1hPyl6K0hlxgvpNSG846CWySFWG\noRYQ4hoNi8aUlTKj90XT07RbVED5pre90arxYd3G+uyl5IxwotZrXg6gajwZbzSd\n46DJ2qClZ3ijDT/6iHNfuwPql2Yz8KxIAHyvKvDgKTpTAZEUdZatnkiaIQGPxP3I\npNDpVLoEs89CG6fk8KiKG6Wymru2MXzhNfbe9EsjogA77zafrR7zIWIx7xE4mWMW\ni4xNlCgZfy6Z3ZnKfFaX7jvZjPBcitaRM4ZXjwIDAQABMA0GCSqGSIb3DQEBCwUA\nA4ICAQCcqqHYr6ozu8Mm1ZGLIV3CG+rRQj6uPwi1+TPxKTE6d7IqEtu3qsxZg/5n\nJNRzwtFvOeDU00Jbix/d52FvQHYKMBe8UQC7lHX0kChiVbUOVarU3ETi018lWexJ\nAHwhNr0bweV5QEITpuGRRX0lCc52onsb+VKbdsDJjNcMpEoZfjS/UCc5x/s1+8h3\nx8N16vOW6m3/OwqPBdrIIb4SV1L/8VjDMXTGn+hqE13G4y4qz1PbJsrOONZ3YQh7\n1YqGl5gbIUIlkxKl1aD8IS4fMsUj7+NKqIlQWkjEYzUhrwPxcXe8bUdPPeeH6DNL\nF1/gFXipzBWYRuaPlw1s2OL29FXMbVhtYwt1QnyHA+iriOMlBiIGj/uOWRtSjJXH\ncy0emozcKLcg527K6FKJH/nS1q+jM15TgHLb89Q0XHlDjROUVEb54vNAa3XmjUwi\n8C2NVYrGy+zq3EwdxJomTlpCTFggWRIvQpoph8IDz/0E875/W0BXe5wOwyOtulRJ\n0zAvCsn8SHSDyjm1dAZDKYnjqXZxaPCWKZ1P6x3iKBDtkiCqmKUUYQoYnImIaMsz\nwWBpz3N9/uHdLq7abQTxZOB/WGFWSDIorRAfqr39M2p/Q/pPVWvp1F6R1uSU7ncq\najPjjcJyD+Dq6hs2wWTRZiltYVavc0dQrsfxnWdl9Aj9/nli1w==\n-----END CERTIFICATE-----\ndiff --git a/test/load1/existing_jmeter_script.yml b/test/load1/existing_jmeter_script.ymlnew file mode 100644index 000000000..82b707a85--- /dev/null+++ b/test/load1/existing_jmeter_script.yml@@ -0,0 +1,14 @@+execution:+- iterations: 50+ concurrency: 10+ scenario: with_script++scenarios:+ with_script:+ script: my-existing.jmx++reporting:+- module: passfail+ criteria:+ - "avg-rt>150ms for 10s, continue as failed"+ - "fail>50% for 10s, stop as failed"\ No newline at end of filediff --git a/test/load1/mqtt_auto_provision.yml b/test/load1/mqtt_auto_provision.ymlnew file mode 100644index 000000000..bf144ae1b--- /dev/null+++ b/test/load1/mqtt_auto_provision.yml@@ -0,0 +1,49 @@+execution:+- concurrency: 1+ ramp-up: 1m+ hold-for: 5m+ scenario: mqtt-client-auto-provision-sub+- concurrency: 1+ hold-for: 15s+ scenario: mqtt-client-auto-provision-pub++scenarios:++ mqtt-client-auto-provision-sub:+ protocol: mqtt+ requests:+ - cmd: connect+ addr: 127.0.0.1+ - cmd: subscribe+ topic: provisioning/${id}/response+ time: 5s+ min-count: 1+ - cmd: disconnect++ data-sources:+ - devices.csv+ delimiter: ','+ quoted: false+ encoding: "utf-8"+ loop: true+ variable-names: id,cert+ random-order: false++ mqtt-client-auto-provision-pub:+ protocol: mqtt+ requests:+ - cmd: connect+ addr: 127.0.0.1+ - cmd: publish+ topic: provisioning/${id}/request+ message: { "type" : "x509", "cert" : "${cert}"}+ - cmd: disconnect++ data-sources:+ - devices.csv+ delimiter: ','+ quoted: false+ encoding: "utf-8"+ loop: true+ variable-names: id,cert+ random-order: false\ No newline at end of filediff --git a/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovyindex 61de1446c..76c8b910a 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy@@ -6,7 +6,7 @@ import org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.datapoint.AssetDatapointServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.attribute.AttributeRefimport org.openremote.model.datapoint.DatapointIntervalimport org.openremote.model.util.ValueUtil@@ -24,7 +24,7 @@ import static java.util.concurrent.TimeUnit.DAYSimport static java.util.concurrent.TimeUnit.MINUTESimport static java.util.concurrent.TimeUnit.SECONDSimport static org.openremote.manager.datapoint.AssetDatapointService.OR_DATA_POINTS_MAX_AGE_DAYS_DEFAULT-import static org.openremote.test.setup.ManagerTestSetup.thingLightToggleAttributeName+import static org.openremote.setup.integration.ManagerTestSetup.thingLightToggleAttributeNameimport static spock.util.matcher.HamcrestMatchers.closeToclass AssetDatapointTest extends Specification implements ManagerContainerTrait {diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovyindex fa66c12a6..71bf3f5f9 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy@@ -2,8 +2,8 @@ package org.openremote.test.assetsimport org.openremote.container.util.UniqueIdentifierGeneratorimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.AssetResourceimport org.openremote.model.asset.impl.RoomAssetimport org.openremote.model.asset.impl.ThingAssetdiff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovyindex 2db66230b..d1f7d8a27 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy@@ -10,14 +10,12 @@ import org.openremote.model.query.AssetQueryimport org.openremote.model.query.filter.ParentPredicateimport org.openremote.model.query.filter.RealmPredicateimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.BadRequestExceptionimport javax.ws.rs.ForbiddenException-import javax.ws.rs.NotAuthorizedExceptionimport javax.ws.rs.WebApplicationExceptionimport static org.openremote.container.util.MapAccess.getStringdiff --git a/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovyindex f6a98a9a7..82a9056d3 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy@@ -6,15 +6,15 @@ import org.openremote.manager.datapoint.AssetDatapointServiceimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.asset.agent.DefaultAgentLink-import org.openremote.test.protocol.MockAgentLink-import org.openremote.test.setup.KeycloakTestSetup+import org.openremote.setup.integration.protocol.MockAgentLink+import org.openremote.setup.integration.KeycloakTestSetupimport org.openremote.model.asset.Assetimport org.openremote.model.asset.agent.ConnectionStatusimport org.openremote.model.asset.impl.ThingAssetimport org.openremote.model.attribute.*import org.openremote.test.ManagerContainerTrait-import org.openremote.test.protocol.MockAgent-import org.openremote.test.protocol.MockProtocol+import org.openremote.setup.integration.protocol.MockAgent+import org.openremote.setup.integration.protocol.MockProtocolimport spock.lang.Specificationimport spock.util.concurrent.PollingConditionsdiff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovyindex 5ceb44309..7bb393c98 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy@@ -7,8 +7,8 @@ import org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.Constants-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.agent.Agentimport org.openremote.model.asset.impl.BuildingAssetimport org.openremote.model.asset.impl.RoomAssetdiff --git a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovyindex 633bbb76a..9b7647d5e 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy@@ -5,8 +5,8 @@ import org.openremote.container.security.keycloak.AccessTokenAuthContextimport org.openremote.container.timer.TimerServiceimport org.openremote.manager.security.ManagerIdentityServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.AssetResourceimport org.openremote.model.asset.UserAssetLinkimport org.openremote.test.ManagerContainerTraitdiff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovyindex b71872f3c..7105d6c3e 100644--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy@@ -12,8 +12,8 @@ import org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapterimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.Assetimport org.openremote.model.asset.AssetResourceimport org.openremote.model.asset.impl.ConsoleAsset@@ -40,8 +40,8 @@ import javax.ws.rs.WebApplicationExceptionimport java.util.concurrent.TimeUnitimport java.util.stream.IntStream-import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_SMART_BUILDING-import static org.openremote.test.setup.ManagerTestSetup.SMART_BUILDING_LOCATION+import static org.openremote.setup.integration.ManagerTestSetup.DEMO_RULE_STATES_SMART_BUILDING+import static org.openremote.setup.integration.ManagerTestSetup.SMART_BUILDING_LOCATIONimport static org.openremote.model.Constants.KEYCLOAK_CLIENT_IDimport static org.openremote.model.asset.AssetResource.Util.WRITE_ATTRIBUTE_HTTP_METHODimport static org.openremote.model.asset.AssetResource.Util.getWriteAttributeUrldiff --git a/test/src/test/groovy/org/openremote/test/dashboard/DashboardTest.groovy b/test/src/test/groovy/org/openremote/test/dashboard/DashboardTest.groovyindex da5c6bdc8..9b38b7a55 100644--- a/test/src/test/groovy/org/openremote/test/dashboard/DashboardTest.groovy+++ b/test/src/test/groovy/org/openremote/test/dashboard/DashboardTest.groovy@@ -4,8 +4,8 @@ import org.openremote.manager.setup.SetupServiceimport org.openremote.model.dashboard.Dashboardimport org.openremote.model.dashboard.DashboardResourceimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Ignoreimport spock.lang.Specificationdiff --git a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovyindex 586a3c687..849e48487 100644--- a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy@@ -14,7 +14,7 @@ import org.openremote.model.attribute.AttributeRefimport org.openremote.model.datapoint.DatapointIntervalimport org.openremote.model.util.ValueUtilimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Specificationimport spock.util.concurrent.PollingConditionsdiff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovyindex 80f3691ed..49d93d05c 100644--- a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy@@ -12,7 +12,7 @@ import org.openremote.model.attribute.AttributeRefimport org.openremote.model.geo.GeoJSONPointimport org.openremote.model.util.ValueUtilimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Ignoreimport spock.lang.Sharedimport spock.lang.Specificationdiff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovyindex be524202d..599611223 100644--- a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy@@ -12,7 +12,7 @@ import org.openremote.model.attribute.AttributeRefimport org.openremote.model.geo.GeoJSONPointimport org.openremote.model.util.ValueUtilimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Ignoreimport spock.lang.Sharedimport spock.lang.Specificationdiff --git a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovyindex 292adfa7c..2cea5dc3a 100644--- a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy+++ b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy@@ -20,7 +20,7 @@ import org.openremote.manager.security.ManagerIdentityServiceimport org.openremote.manager.security.ManagerKeycloakIdentityProviderimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.security.User-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.*import org.openremote.model.asset.agent.ConnectionStatusimport org.openremote.model.asset.impl.BuildingAssetdiff --git a/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy b/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovyindex 1693aea32..f0aeccc04 100644--- a/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy+++ b/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy@@ -25,7 +25,7 @@ import org.openremote.model.value.ValueTypeimport org.openremote.model.util.ValueUtilimport org.openremote.model.value.impl.ColourRGBimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.protocol.http.HTTPServerTestAgent+import org.openremote.setup.integration.protocol.http.HTTPServerTestAgentimport spock.lang.Sharedimport spock.lang.Specificationdiff --git a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovyindex 03b6635db..931541a36 100644--- a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy@@ -27,8 +27,8 @@ import org.openremote.model.auth.UsernamePasswordimport org.openremote.model.event.shared.SharedEventimport org.openremote.model.util.ValueUtilimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Specificationimport spock.util.concurrent.PollingConditionsdiff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovyindex e8e1f16b8..8ff458365 100644--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy@@ -22,8 +22,8 @@ import org.openremote.model.query.UserQueryimport org.openremote.model.query.filter.RealmPredicateimport org.openremote.model.util.TextUtilimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.simplejavamail.email.Emailimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions@@ -33,8 +33,6 @@ import java.time.Instantimport java.time.temporal.ChronoUnitimport java.util.concurrent.TimeUnit-import static org.openremote.container.timer.TimerService.Clock.REAL-import static org.openremote.container.timer.TimerService.TIMER_CLOCK_TYPEimport static org.openremote.container.util.MapAccess.getStringimport static org.openremote.manager.security.ManagerIdentityProvider.OR_ADMIN_PASSWORDimport static org.openremote.manager.security.ManagerIdentityProvider.OR_ADMIN_PASSWORD_DEFAULTdiff --git a/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovyindex 078bfd384..5ee4a7718 100644--- a/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy@@ -32,6 +32,9 @@ import org.openremote.model.value.ValueFilterimport org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions+import org.openremote.setup.integration.protocol.MockAgent+import org.openremote.setup.integration.protocol.MockAgentLink+import org.openremote.setup.integration.protocol.MockProtocolimport java.util.regex.Patterndiff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovyindex 5240f1570..a7b11f709 100644--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy@@ -42,6 +42,9 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions+import org.openremote.setup.integration.protocol.http.HTTPServerTestAgent+import org.openremote.setup.integration.protocol.http.TestHTTPServerProtocol+import org.openremote.setup.integration.protocol.http.TestResourceimport javax.ws.rs.ForbiddenExceptionimport javax.ws.rs.HttpMethoddiff --git a/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovyindex c19571153..d23b1ae52 100644--- a/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy@@ -41,8 +41,8 @@ import org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.MetaItemimport org.openremote.model.auth.UsernamePasswordimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Specificationimport spock.util.concurrent.PollingConditionsdiff --git a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusBasicTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusBasicTest.groovyindex 120d86e65..385f25d25 100644--- a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusBasicTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusBasicTest.groovy@@ -29,6 +29,7 @@ import org.openremote.model.attribute.AttributeExecuteStatusimport spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions+import org.openremote.setup.integration.protocol.velbus.MockVelbusClientimport static spock.util.matcher.HamcrestMatchers.closeTodiff --git a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovyindex 29e9b4c2b..6d9843e8c 100644--- a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy@@ -16,6 +16,8 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions+import org.openremote.setup.integration.protocol.velbus.MockVelbusAgent+import org.openremote.setup.integration.protocol.velbus.MockVelbusProtocolimport java.util.stream.Collectorsdiff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovyindex f869f9900..f3eb18cd4 100644--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy@@ -49,7 +49,7 @@ import org.openremote.model.value.SubStringValueFilterimport org.openremote.model.value.ValueFilterimport org.openremote.model.value.ValueTypeimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditionsdiff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovyindex 00fbc8745..15756e34f 100644--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy@@ -27,7 +27,7 @@ import org.openremote.manager.agent.AgentServiceimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.AssetFilterimport org.openremote.model.asset.agent.ConnectionStatusimport org.openremote.model.attribute.AttributeEventdiff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovyindex cde5f778b..4f87b21cf 100644--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy@@ -41,7 +41,6 @@ import org.openremote.manager.provisioning.UserAssetProvisioningMQTTHandlerimport org.openremote.manager.security.ManagerIdentityServiceimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.asset.AssetEvent-import org.openremote.model.asset.UserAssetLinkimport org.openremote.model.asset.agent.ConnectionStatusimport org.openremote.model.asset.impl.WeatherAssetimport org.openremote.model.attribute.Attribute@@ -56,7 +55,7 @@ import org.openremote.model.util.ValueUtilimport org.openremote.model.value.MetaItemTypeimport org.openremote.model.value.ValueTypeimport org.openremote.test.ManagerContainerTrait-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions@@ -114,7 +113,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContawhen: "a provisioning realm config is added to the system"def provisioningConfig = new X509ProvisioningConfig("Valid Test Config",new X509ProvisioningData()- .setCACertPEM(getClass().getResource("/org/openremote/test/provisioning/ca_long.pem").text)+ .setCACertPEM(getClass().getResource("/org/openremote/test/provisioning/ca.pem").text)).setAssetTemplate(ValueUtil.asJSON(new WeatherAsset("Weather Asset")diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovyindex e6fbbb6c6..6b912a735 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy@@ -1,18 +1,14 @@package org.openremote.test.rulesimport org.openremote.manager.rules.RulesEngine-import org.openremote.manager.rules.RulesFacts-import org.openremote.manager.rules.RulesLoopExceptionimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.security.ManagerIdentityServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup-import org.openremote.model.attribute.MetaItem+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.GlobalRuleset-import org.openremote.model.rules.Rulesetimport org.openremote.model.rules.RealmRulesetimport org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationdiff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovyindex 0f7506bc7..ff3beec0c 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy@@ -7,8 +7,8 @@ import org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.GlobalRulesetimport org.openremote.model.rules.RealmRulesetimport org.openremote.model.rules.Ruleset-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport static org.openremote.model.rules.Ruleset.Lang.GROOVYimport static org.openremote.model.rules.RulesetStatus.DEPLOYEDdiff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovyindex b57789680..764356ebf 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy@@ -6,8 +6,8 @@ import org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.impl.RoomAssetimport org.openremote.model.attribute.Attributeimport org.openremote.model.attribute.AttributeEvent@@ -24,7 +24,7 @@ import spock.util.concurrent.PollingConditionsimport java.util.concurrent.TimeUnit-import static org.openremote.test.setup.ManagerTestSetup.*+import static org.openremote.setup.integration.ManagerTestSetup.*import static org.openremote.model.rules.RulesetStatus.*import static org.openremote.test.rules.BasicRulesImport.assertRulesFireddiff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesTimedExecutionTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesTimedExecutionTest.groovyindex dd397a488..51fb09279 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesTimedExecutionTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesTimedExecutionTest.groovy@@ -12,7 +12,7 @@ import spock.lang.Specificationimport spock.util.concurrent.PollingConditionsimport static java.util.concurrent.TimeUnit.SECONDS-import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_GLOBAL+import static org.openremote.setup.integration.ManagerTestSetup.DEMO_RULE_STATES_GLOBAL@Ignore // TODO Implement timer/deferred actions in rules engineclass BasicRulesTimedExecutionTest extends Specification implements ManagerContainerTrait {diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovyindex dd3f77a51..d56979a34 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -3,8 +3,8 @@ package org.openremote.test.rulesimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.rules.*import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationdiff --git a/test/src/test/groovy/org/openremote/test/rules/ChildAssetControlRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/ChildAssetControlRulesTest.groovyindex ac624cbb2..c90d626f8 100644--- a/test/src/test/groovy/org/openremote/test/rules/ChildAssetControlRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/ChildAssetControlRulesTest.groovy@@ -93,6 +93,52 @@ class ChildAssetControlRulesTest extends Specification implements ManagerContainassert light.getAttribute(LightAsset.ON_OFF).flatMap { it.getTimestamp()}.orElse(0) == parentAsset.getAttribute(LightAsset.ON_OFF).flatMap { it.getTimestamp()}.orElse(-1)}}++ when: "a new child asset is added to the root"+ def lightAsset = new LightAsset("Light 101")+ .setId(UniqueIdentifierGenerator.generateId("Light 101"))+ .setRealm(Constants.MASTER_REALM)++ lightAsset.getAttribute(LightAsset.ON_OFF).ifPresentOrElse(attr -> {attr.addMeta(new MetaItem<>(MetaItemType.RULE_STATE))}, null)+ lightAsset.getAttribute(LightAsset.BRIGHTNESS).ifPresentOrElse(attr -> {attr.addMeta(new MetaItem<>(MetaItemType.RULE_STATE))}, null)+ lightAsset.getAttribute(LightAsset.COLOUR_RGB).ifPresentOrElse(attr -> {attr.addMeta(new MetaItem<>(MetaItemType.RULE_STATE))}, null)+ lightAsset.getAttribute(LightAsset.COLOUR_TEMPERATURE).ifPresentOrElse(attr -> {attr.addMeta(new MetaItem<>(MetaItemType.RULE_STATE))}, null)+ lightAsset.getAttribute(LightAsset.ON_OFF).ifPresent { it.setValue(true)}+ lightAsset = assetStorageService.merge(lightAsset)++ then: "the child asset states should be loaded into the rule engine"+ conditions.eventually {+ assert engine.assetStates.count { it.id == lightAsset.id} == 4+ }++ when: "the child asset is moved under the group parent"+ lightAsset.setParent(parentAsset)+ lightAsset = assetStorageService.merge(lightAsset)++ then: "the child asset states should be loaded into the rule engine"+ conditions.eventually {+ assert engine.assetStates.count { it.id == lightAsset.id && it.parentId == parentAsset.id} == 4+ }++ when: "The on/off attribute of the parent asset is written to"+ assetProcessingService.sendAttributeEvent(+ new AttributeEvent(parentAsset.id, LightAsset.ON_OFF, false)+ )++ then: "the parent asset attribute should be updated"+ conditions.eventually {+ parentAsset = assetStorageService.find(parentAsset.id, true) as LightAsset+ assert !parentAsset.getAttribute(LightAsset.ON_OFF).flatMap{it.value}.orElse(true)+ }++ and: "all child lights on/off attributes should now show the same value"+ conditions.eventually {+ for (int i=1; i<=101; i++) {+ def light = assetStorageService.find(UniqueIdentifierGenerator.generateId("Light ${i}"), true) as LightAsset+ assert !light.getOnOff().orElse(true)+ assert light.getAttribute(LightAsset.ON_OFF).flatMap { it.getTimestamp()}.orElse(0) == parentAsset.getAttribute(LightAsset.ON_OFF).flatMap { it.getTimestamp()}.orElse(-1)+ }+ }}}diff --git a/test/src/test/groovy/org/openremote/test/rules/RulesExecutionFailureTest.groovy b/test/src/test/groovy/org/openremote/test/rules/RulesExecutionFailureTest.groovyindex 0b05a5cda..b9643fd5d 100644--- a/test/src/test/groovy/org/openremote/test/rules/RulesExecutionFailureTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/RulesExecutionFailureTest.groovy@@ -1,10 +1,9 @@package org.openremote.test.rules-import org.junit.Ignore+import org.openremote.manager.rules.*import org.openremote.manager.setup.SetupService-import org.openremote.test.setup.ManagerTestSetup-import org.openremote.model.attribute.MetaItem+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.Rulesetimport org.openremote.model.rules.RulesetStatusdiff --git a/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovyindex 838a0fad2..bf74e914c 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy@@ -6,7 +6,7 @@ import org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.rules.GlobalRulesetimport org.openremote.model.rules.Rulesetdiff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovyindex dff8663b3..586358f59 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy@@ -20,13 +20,11 @@ import org.openremote.manager.setup.SetupServiceimport org.openremote.model.asset.UserAssetLinkimport org.openremote.model.asset.impl.ThingAssetimport org.openremote.model.attribute.Attribute-import org.openremote.model.rules.json.JsonRuleimport org.openremote.model.value.ValueType-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.KeycloakTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.Assetimport org.openremote.model.attribute.AttributeEvent-import org.openremote.model.attribute.MetaItemimport org.openremote.model.calendar.CalendarEventimport org.openremote.model.console.ConsoleProviderimport org.openremote.model.console.ConsoleRegistration@@ -54,7 +52,7 @@ import java.util.concurrent.TimeUnitimport static java.util.concurrent.TimeUnit.HOURSimport static java.util.concurrent.TimeUnit.MILLISECONDS-import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_SMART_BUILDING+import static org.openremote.setup.integration.ManagerTestSetup.DEMO_RULE_STATES_SMART_BUILDINGimport static org.openremote.model.Constants.KEYCLOAK_CLIENT_IDimport static org.openremote.model.util.ValueUtil.parse@@ -378,8 +376,8 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {and: "a validity period is added to the ruleset (fictional times to ensure firing in sensible time within test)"version = ruleset.version- def validityStart = Instant.ofEpochMilli(getClockTimeOf(container)).plus(2000, ChronoUnit.MILLIS)- def validityEnd = Instant.ofEpochMilli(getClockTimeOf(container)).plus(4000, ChronoUnit.MILLIS)+ def validityStart = Instant.ofEpochMilli(getClockTimeOf(container)).plus(2, ChronoUnit.HOURS)+ def validityEnd = Instant.ofEpochMilli(getClockTimeOf(container)).plus(4, ChronoUnit.HOURS)def recur = new Recur(Recur.DAILY, 3)recur.setInterval(2)def calendarEvent = new CalendarEvent(diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovyindex 6e31ae61c..fc55fd396 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy@@ -6,7 +6,7 @@ import org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.Ruleset@@ -17,7 +17,7 @@ import spock.lang.Specificationimport spock.util.concurrent.PollingConditionsimport static java.util.concurrent.TimeUnit.SECONDS-import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_2+import static org.openremote.setup.integration.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_2@Ignoreclass ResidenceAllLightsOffTest extends Specification implements ManagerContainerTrait {diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovyindex b0c94f39e..330f68dcd 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy@@ -7,7 +7,7 @@ import org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.Ruleset@@ -18,7 +18,7 @@ import spock.lang.Specificationimport spock.util.concurrent.PollingConditionsimport static java.util.concurrent.TimeUnit.MINUTES-import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1+import static org.openremote.setup.integration.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1import static org.openremote.model.attribute.AttributeEvent.Source.SENSOR// Ignore this test as temporary facts (rule events) cause the rule engine to continually fire, need to decide ifdiff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovyindex ce90437a9..a484bad0b 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy@@ -19,7 +19,7 @@ import org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapterimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.calendar.CalendarEventimport org.openremote.model.rules.RulesetStatus-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.AttributeRefimport org.openremote.model.console.ConsoleProvider@@ -38,15 +38,12 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import java.time.Clockimport java.time.Instant-import java.time.Period-import java.time.ZoneIdimport java.time.ZoneOffsetimport java.time.temporal.ChronoUnitimport java.util.concurrent.TimeUnit-import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1+import static org.openremote.setup.integration.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1import static org.openremote.model.Constants.KEYCLOAK_CLIENT_IDimport static org.openremote.model.asset.AssetResource.Util.WRITE_ATTRIBUTE_HTTP_METHODimport static org.openremote.model.asset.AssetResource.Util.getWriteAttributeUrl@@ -315,7 +312,7 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoassert from.plus(7, ChronoUnit.DAYS).toEpochMilli() - getClockTimeOf(container) - apartment1Engine.unpauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000when: "time advances to within the next valid time period"- advancePseudoClock((from.plus(7, ChronoUnit.DAYS).toEpochMilli()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)+ advancePseudoClock((from.plus(7, ChronoUnit.DAYS).plus(61, ChronoUnit.MINUTES).toEpochMilli() - getClockTimeOf(container)), TimeUnit.MILLISECONDS, container)apartment1Engine.unPauseRuleset(rulesetDeployment)then: "the ruleset status should be un-paused"@@ -330,7 +327,7 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoassert to.plus(7, ChronoUnit.DAYS).toEpochMilli() - getClockTimeOf(container) - apartment1Engine.pauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000when: "time advances past the second expiry the ruleset is paused again"- advancePseudoClock((to.plus(7, ChronoUnit.DAYS).toEpochMilli()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)+ advancePseudoClock((to.plus(7, ChronoUnit.DAYS).plus(61, ChronoUnit.MINUTES).toEpochMilli()-getClockTimeOf(container)), TimeUnit.MILLISECONDS, container)apartment1Engine.pauseRuleset(rulesetDeployment)then: "the ruleset status should be expired"diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovyindex 267fa2863..512e12f01 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy@@ -7,7 +7,7 @@ import org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.Ruleset@@ -18,7 +18,7 @@ import spock.lang.Specificationimport spock.util.concurrent.PollingConditionsimport static java.util.concurrent.TimeUnit.MINUTES-import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1+import static org.openremote.setup.integration.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1import static org.openremote.model.attribute.AttributeEvent.Source.SENSOR// Ignore this test as temporary facts (rule events) cause the rule engine to continually fire, need to decide ifdiff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovyindex 9e0270153..1709dabfc 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy@@ -6,7 +6,7 @@ import org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupService-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.Ruleset@@ -17,7 +17,7 @@ import spock.lang.Specificationimport spock.util.concurrent.PollingConditionsimport static java.util.concurrent.TimeUnit.HOURS-import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1+import static org.openremote.setup.integration.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1@Ignoreclass ResidenceSmartSwitchTest extends Specification implements ManagerContainerTrait {diff --git a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovyindex 7a777b27b..cc4ae1160 100644--- a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy@@ -23,7 +23,7 @@ import org.openremote.container.security.keycloak.KeycloakIdentityProviderimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.query.UserQueryimport org.openremote.model.query.filter.RealmPredicate-import org.openremote.test.setup.KeycloakTestSetup+import org.openremote.setup.integration.KeycloakTestSetupimport org.openremote.model.security.ClientRoleimport org.openremote.model.security.Roleimport org.openremote.model.security.UserResourcediff --git a/test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProvider b/test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProviderdeleted file mode 100644index 6c78d8ca7..000000000--- a/test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProvider+++ /dev/null@@ -1 +0,0 @@-org.openremote.test.model.TestAssetModelProviderdiff --git a/test/src/test/resources/META-INF/services/org.openremote.model.setup.SetupTasks b/test/src/test/resources/META-INF/services/org.openremote.model.setup.SetupTasksdeleted file mode 100644index f00602d36..000000000--- a/test/src/test/resources/META-INF/services/org.openremote.model.setup.SetupTasks+++ /dev/null@@ -1 +0,0 @@-org.openremote.test.setup.TestSetupTasksdiff --git a/test/src/test/resources/org/openremote/test/provisioning/ca.pem b/test/src/test/resources/org/openremote/test/provisioning/ca.pemnew file mode 100644index 000000000..b98be40e6--- /dev/null+++ b/test/src/test/resources/org/openremote/test/provisioning/ca.pem@@ -0,0 +1,35 @@+-----BEGIN CERTIFICATE-----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+-----END CERTIFICATE-----diff --git a/test/src/test/resources/org/openremote/test/rules/BasicBrokenRules.groovy b/test/src/test/resources/org/openremote/test/rules/BasicBrokenRules.groovyindex 89266baf3..7d1526733 100644--- a/test/src/test/resources/org/openremote/test/rules/BasicBrokenRules.groovy+++ b/test/src/test/resources/org/openremote/test/rules/BasicBrokenRules.groovy@@ -1 +1,3 @@+package org.openremote.setup.integration.rules+THIS IS NOT A VALID GROOVY FILE.diff --git a/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates.groovy b/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates.groovyindex 67801b4b2..6670f6f6b 100644--- a/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates.groovy+++ b/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates.groovy@@ -1,7 +1,7 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilder-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.query.AssetQueryimport org.openremote.model.query.filter.LocationAttributePredicateimport org.openremote.model.query.filter.RadialGeofencePredicatediff --git a/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy b/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates2.groovyindex c33197b69..a8d9c287d 100644--- a/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy+++ b/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy@@ -1,7 +1,7 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilder-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.query.AssetQueryimport org.openremote.model.query.filter.LocationAttributePredicateimport org.openremote.model.query.filter.RadialGeofencePredicatediff --git a/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy b/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovyindex d71a7cd5c..9ba1fc84d 100644--- a/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy+++ b/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy@@ -1,4 +1,4 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.model.query.AssetQuerydiff --git a/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy b/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovyindex 239ee21de..f9587a776 100644--- a/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy+++ b/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy@@ -1,6 +1,6 @@// Renamed rules so they can be deployed again-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.model.query.AssetQuerydiff --git a/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy b/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovyindex 06d8271d2..70480d537 100644--- a/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy+++ b/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy@@ -1,4 +1,4 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.model.asset.impl.BuildingAssetdiff --git a/test/src/test/resources/org/openremote/test/rules/ChildAssetControl.groovy b/test/src/test/resources/org/openremote/test/rules/ChildAssetControl.groovyindex 833a2fae1..1bb66238e 100644--- a/test/src/test/resources/org/openremote/test/rules/ChildAssetControl.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ChildAssetControl.groovy@@ -3,7 +3,7 @@* parent asset ID below. The parent and child attributes must have the RULE_STATE configuration items set.*/-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.model.attribute.AttributeEventdiff --git a/test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy b/test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovyindex f4bd8c1e0..f6bec0c3b 100644--- a/test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy@@ -1,8 +1,8 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.model.notification.*-import org.openremote.test.setup.ManagerTestSetup+import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.model.asset.Assetimport org.openremote.model.asset.impl.*import org.openremote.model.query.*diff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovyindex 9d1d1533a..6d5eab26c 100644--- a/test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy@@ -1,4 +1,4 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.manager.rules.RulesFactsdiff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovyindex 98ed8a7dc..386d4ed06 100644--- a/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy@@ -1,4 +1,4 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport groovy.transform.ToStringimport org.openremote.manager.rules.RulesBuilderdiff --git a/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy b/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovyindex 8ad894211..088150d41 100644--- a/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy@@ -7,7 +7,7 @@ in a room over a time window that is internal to the sensor (e.g. the last minut'presenceDetected' attribute of the residence is set depending on whether any child roomassets have presence set.*/-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.model.asset.impl.BuildingAssetdiff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovyindex e37e9669c..20153fb5b 100644--- a/test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy@@ -1,4 +1,4 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.manager.rules.RulesFactsdiff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovyindex b8dc8d2ee..ffe110a20 100644--- a/test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy@@ -1,4 +1,4 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport groovy.transform.ToStringimport org.openremote.manager.rules.RulesBuilderdiff --git a/test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy b/test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovyindex 86533d557..9a8460f45 100644--- a/test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy+++ b/test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy@@ -1,4 +1,4 @@-package org.openremote.test.rules+package org.openremote.setup.integration.rulesimport org.openremote.manager.rules.RulesBuilderimport org.openremote.model.attribute.AttributeEventdiff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex a11f0badd..49cd4fc5d 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -358,7 +358,7 @@ export class Manager implements EventProviderFactory {success = await this.doAuthInit();} else {- if (this._authServerUrl) {+ if (!this._config.keycloakUrl) {this.config.keycloakUrl = this._authServerUrl;}