feature: update frontend to 0.4.1

Signed-off-by: tiny-x <[email protected]>
chaosblade-io · May 10, 2021 · 3a5f574 · 3a5f574
1 parent e5fb42c
commit 3a5f574
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 20 deletions.
diff --git a/...-box-service/src/main/java/com/alibaba/chaosblade/box/service/collect/CollectorTimer.java b/...-box-service/src/main/java/com/alibaba/chaosblade/box/service/collect/CollectorTimer.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.chaosblade.box.service.collect;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.EnumUtil;
@@ -310,25 +311,29 @@ public void afterPropertiesSet() {
             if (strategy.value() == collectorType) {
                 if (value instanceof NodeCollector) {
                     nodeCollector = (NodeCollector) value;
-                    if (enableCollect) {
-                        nodeCollect(nodeCollector, Query.builder().build());
-                    }
                 }
                 if (value instanceof PodCollector) {
                     podCollector = (PodCollector) value;
-                    if (enableCollect) {
-                        podCollect(podCollector, Query.builder().build());
-                    }
                 }
                 if (value instanceof ContainerCollector) {
                     containerCollector = (ContainerCollector) value;
-                    if (enableCollect) {
-                        containerCollect(containerCollector, Query.builder().build());
-                    }
                 }
             }
         }
 
+        // todo
+        if (enableCollect) {
+            ClusterDO clusterDO;
+            List<ClusterDO> aDefault = clusterRepository.selectList(ClusterDO.builder().clusterName("default").build());
+            if (CollUtil.isEmpty(aDefault)) {
+                clusterDO = ClusterDO.builder().clusterName("default").build();
+                clusterRepository.insert(clusterDO);
+            } else {
+                clusterDO = aDefault.get(0);
+            }
+            collect(Query.builder().clusterId(clusterDO.getId()).build());
+        }
+
         ScheduledExecutorService scheduledExecutorService = new ScheduledThreadPoolExecutor(1);
 
         scheduledExecutorService.scheduleAtFixedRate(() -> {

diff --git a/...-service/src/main/java/com/alibaba/chaosblade/box/service/impl/ExperimentServiceImpl.java b/...-service/src/main/java/com/alibaba/chaosblade/box/service/impl/ExperimentServiceImpl.java
@@ -173,9 +173,9 @@ private List<DeviceMeta> getDeviceMetas(CreateExperimentRequest createExperiment
                         }
                 ).collect(Collectors.toList());
                 if (original.equals(ChaosTools.CHAOS_BLADE.getName())) {
-                    createExperimentRequest.getParameters().put("names", nodes.stream().map(DeviceMeta::getNodeName).collect(Collectors.joining()));
+                    createExperimentRequest.getParameters().put("names", nodes.stream().map(DeviceMeta::getNodeName).collect(Collectors.joining(",")));
                 } else if (original.equals(ChaosTools.LITMUS_CHAOS.getName())) {
-                    createExperimentRequest.getParameters().put("TARGET_NODES", nodes.stream().map(DeviceMeta::getNodeName).collect(Collectors.joining()));
+                    createExperimentRequest.getParameters().put("TARGET_NODES", nodes.stream().map(DeviceMeta::getNodeName).collect(Collectors.joining(",")));
                 }
                 return nodes;
             case POD:
@@ -205,15 +205,15 @@ private List<DeviceMeta> getDeviceMetas(CreateExperimentRequest createExperiment
                         }
                 ).collect(Collectors.toList());
                 if (original.equals(ChaosTools.CHAOS_BLADE.getName())) {
-                    createExperimentRequest.getParameters().put("names", list.stream().map(DeviceMeta::getPodName).distinct().collect(Collectors.joining()));
-                    String containerNames = list.stream().map(DeviceMeta::getContainerName).distinct().collect(Collectors.joining());
-                    if (StrUtil.isNotBlank(containerNames)) {
+                    createExperimentRequest.getParameters().put("names", list.stream().map(DeviceMeta::getPodName).distinct().collect(Collectors.joining(",")));
+                    String containerNames = list.stream().map(DeviceMeta::getContainerName).distinct().collect(Collectors.joining(","));
+                    if (StrUtil.isNotBlank(containerNames) && !"null".equals(containerNames)) {
                         createExperimentRequest.getParameters().put("container-names", containerNames);
                     }
                 } else if (original.equals(ChaosTools.LITMUS_CHAOS.getName())) {
-                    createExperimentRequest.getParameters().put("TARGET_PODS", list.stream().map(DeviceMeta::getPodName).distinct().collect(Collectors.joining()));
-                    String containerNames = list.stream().map(DeviceMeta::getContainerName).distinct().collect(Collectors.joining());
-                    if (StrUtil.isNotBlank(containerNames)) {
+                    createExperimentRequest.getParameters().put("TARGET_PODS", list.stream().map(DeviceMeta::getPodName).distinct().collect(Collectors.joining(",")));
+                    String containerNames = list.stream().map(DeviceMeta::getContainerName).distinct().collect(Collectors.joining(","));
+                    if (StrUtil.isNotBlank(containerNames) && !"null".equals(containerNames)) {
                         createExperimentRequest.getParameters().put("TARGET_CONTAINER", containerNames);
                     }
                 }

diff --git a/chaosblade-box-web/src/main/resources/web/build/umi.css b/chaosblade-box-web/src/main/resources/web/build/umi.css
diff --git a/chaosblade-box-web/src/main/resources/web/build/umi.js b/chaosblade-box-web/src/main/resources/web/build/umi.js
diff --git a/...eb/src/test/java/com/alibaba/chaosblade/box/web/controller/AgentReportControllerTest.java b/...eb/src/test/java/com/alibaba/chaosblade/box/web/controller/AgentReportControllerTest.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.chaosblade.box.web.controller;
 
+import com.alibaba.chaosblade.box.scenario.api.init.SceneParamComponentLoader;
 import com.alibaba.chaosblade.box.service.ClusterService;
 import com.alibaba.chaosblade.box.service.K8SToolsService;
 import com.alibaba.chaosblade.box.web.ChaosbladeBoxApplication;
@@ -62,6 +63,9 @@ public class AgentReportControllerTest {
     @MockBean
     private MetricCateGoryLoader metricCateGoryLoader;
 
+    @MockBean
+    private SceneParamComponentLoader sceneParamComponentLoader;
+
     @MockBean
     private ClusterService clusterService;
 

diff --git a/...web/src/test/java/com/alibaba/chaosblade/box/web/controller/ExperimentControllerTest.java b/...web/src/test/java/com/alibaba/chaosblade/box/web/controller/ExperimentControllerTest.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.chaosblade.box.web.controller;
 
+import com.alibaba.chaosblade.box.scenario.api.init.SceneParamComponentLoader;
 import com.alibaba.chaosblade.box.service.ClusterService;
 import com.alibaba.chaosblade.box.service.K8SToolsService;
 import com.alibaba.chaosblade.box.web.ChaosbladeBoxApplication;
@@ -64,6 +65,9 @@ public class ExperimentControllerTest {
     @MockBean
     private MetricCateGoryLoader metricCateGoryLoader;
 
+    @MockBean
+    private SceneParamComponentLoader sceneParamComponentLoader;
+
     @MockBean
     private ClusterService clusterService;
 

diff --git a/...src/test/java/com/alibaba/chaosblade/box/web/controller/ExperimentTaskControllerTest.java b/...src/test/java/com/alibaba/chaosblade/box/web/controller/ExperimentTaskControllerTest.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.chaosblade.box.web.controller;
 
+import com.alibaba.chaosblade.box.scenario.api.init.SceneParamComponentLoader;
 import com.alibaba.chaosblade.box.service.ClusterService;
 import com.alibaba.chaosblade.box.service.K8SToolsService;
 import com.alibaba.chaosblade.box.web.ChaosbladeBoxApplication;
@@ -67,6 +68,9 @@ public class ExperimentTaskControllerTest {
     @MockBean
     private MetricCateGoryLoader metricCateGoryLoader;
 
+    @MockBean
+    private SceneParamComponentLoader sceneParamComponentLoader;
+
     @MockBean
     private ClusterService clusterService;
 

diff --git a/...ox-web/src/test/java/com/alibaba/chaosblade/box/web/controller/MachineControllerTest.java b/...ox-web/src/test/java/com/alibaba/chaosblade/box/web/controller/MachineControllerTest.java
@@ -17,6 +17,7 @@
 package com.alibaba.chaosblade.box.web.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.chaosblade.box.scenario.api.init.SceneParamComponentLoader;
 import com.alibaba.chaosblade.box.service.ClusterService;
 import com.alibaba.chaosblade.box.service.K8SToolsService;
 import com.alibaba.chaosblade.box.service.model.device.*;
@@ -72,6 +73,9 @@ public class MachineControllerTest {
     @MockBean
     private MetricCateGoryLoader metricCateGoryLoader;
 
+    @MockBean
+    private SceneParamComponentLoader sceneParamComponentLoader;
+
     @MockBean
     private ClusterService clusterService;
 

diff --git a/...e-box-web/src/test/java/com/alibaba/chaosblade/box/web/controller/MainControllerTest.java b/...e-box-web/src/test/java/com/alibaba/chaosblade/box/web/controller/MainControllerTest.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.chaosblade.box.web.controller;
 
+import com.alibaba.chaosblade.box.scenario.api.init.SceneParamComponentLoader;
 import com.alibaba.chaosblade.box.service.ClusterService;
 import com.alibaba.chaosblade.box.service.K8SToolsService;
 import com.alibaba.chaosblade.box.web.ChaosbladeBoxApplication;
@@ -65,6 +66,9 @@ public class MainControllerTest {
     @MockBean
     private SceneCategoryLoader sceneCategoryLoader;
 
+    @MockBean
+    private SceneParamComponentLoader sceneParamComponentLoader;
+
     @MockBean
     private MetricCateGoryLoader metricCateGoryLoader;