wip

Author: kozjan

envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/reliability/EnvoyControlDownTest.kt

@@ -1,9 +1,27 @@
 package pl.allegro.tech.servicemesh.envoycontrol.reliability
 
+import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
+import pl.allegro.tech.servicemesh.envoycontrol.config.envoycontrol.EnvoyControlRunnerTestApp
 
 internal class EnvoyControlDownTest : ReliabilityTest() {
 
+    companion object {
+        @JvmStatic
+        @BeforeAll
+        fun setup() {
+            setup(
+                appFactoryForEc1 = {
+                    EnvoyControlRunnerTestApp(
+                        consulPort = Toxiproxy.externalConsulPort,
+                        grpcPort = Toxiproxy.toxiproxyGrpcPort
+                    )
+                },
+                envoyConnectGrpcPort = Toxiproxy.externalEnvoyControl1GrpcPort
+            )
+        }
+    }
+
     @Test
     fun `is resilient to EnvoyControl failure in one dc`() {
         // given

envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/reliability/LocalConsulAgentDownTest.kt

@@ -1,9 +1,28 @@
 package pl.allegro.tech.servicemesh.envoycontrol.reliability
 
+import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
+import pl.allegro.tech.servicemesh.envoycontrol.config.envoycontrol.EnvoyControlRunnerTestApp
 import pl.allegro.tech.servicemesh.envoycontrol.reliability.Toxiproxy.Companion.consulProxy
 
 internal class LocalConsulAgentDownTest : ReliabilityTest() {
+
+    companion object {
+        @JvmStatic
+        @BeforeAll
+        fun setup() {
+            setup(
+                appFactoryForEc1 = {
+                    EnvoyControlRunnerTestApp(
+                        consulPort = Toxiproxy.externalConsulPort,
+                        grpcPort = Toxiproxy.toxiproxyGrpcPort
+                    )
+                },
+                envoyConnectGrpcPort = Toxiproxy.externalEnvoyControl1GrpcPort
+            )
+        }
+    }
+
     @Test
     fun `is resilient to transient unavailability of EC's local Consul agent`() {
         // given

envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/reliability/LocalConsulAgentToMasterCutOff.kt

@@ -1,8 +1,26 @@
 package pl.allegro.tech.servicemesh.envoycontrol.reliability
 
+import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
+import pl.allegro.tech.servicemesh.envoycontrol.config.envoycontrol.EnvoyControlRunnerTestApp
 
 internal class LocalConsulAgentToMasterCutOff : ReliabilityTest() {
+    companion object {
+        @JvmStatic
+        @BeforeAll
+        fun setup() {
+            setup(
+                appFactoryForEc1 = {
+                    EnvoyControlRunnerTestApp(
+                        consulPort = Toxiproxy.externalConsulPort,
+                        grpcPort = Toxiproxy.toxiproxyGrpcPort
+                    )
+                },
+                envoyConnectGrpcPort = Toxiproxy.externalEnvoyControl1GrpcPort
+            )
+        }
+    }
+
 
     @Test
     fun `should register service when communication between local agent and master is restored`() {

envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/reliability/NoConsulLeaderTest.kt

@@ -1,8 +1,26 @@
 package pl.allegro.tech.servicemesh.envoycontrol.reliability
 
+import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
+import pl.allegro.tech.servicemesh.envoycontrol.config.envoycontrol.EnvoyControlRunnerTestApp
 
 internal class NoConsulLeaderTest : ReliabilityTest() {
+    companion object {
+        @JvmStatic
+        @BeforeAll
+        fun setup() {
+            setup(
+                appFactoryForEc1 = {
+                    EnvoyControlRunnerTestApp(
+                        consulPort = Toxiproxy.externalConsulPort,
+                        grpcPort = Toxiproxy.toxiproxyGrpcPort
+                    )
+                },
+                envoyConnectGrpcPort = Toxiproxy.externalEnvoyControl1GrpcPort
+            )
+        }
+    }
+
     @Test
     fun `is resilient to consul cluster without a leader`() {
         // given

envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/reliability/ReliabilityTest.kt

@@ -22,19 +22,6 @@ import java.time.Duration
 open class ReliabilityTest : EnvoyControlTestConfiguration() {
 
     companion object {
-        @JvmStatic
-        @BeforeAll
-        fun setup() {
-            setup(
-                appFactoryForEc1 = {
-                    EnvoyControlRunnerTestApp(
-                        consulPort = externalConsulPort,
-                        grpcPort = toxiproxyGrpcPort
-                    )
-                },
-                envoyConnectGrpcPort = externalEnvoyControl1GrpcPort
-            )
-        }
 
         @JvmStatic
         @AfterAll