test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

校验资源池

This commit is contained in:
Captain.B 2020-04-30 15:18:46 +08:00
parent cec3af5062
commit e7cfbc235f
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
View File

@ -29,6 +29,7 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static io.metersphere.commons.constants.ResourceStatusEnum.INVALID;
import static io.metersphere.commons.constants.ResourceStatusEnum.VALID; import static io.metersphere.commons.constants.ResourceStatusEnum.VALID;
/** /**
@ -98,6 +99,7 @@ public class TestResourcePoolService {
if (nodeIps.size() < testResourcePool.getResources().size()) { if (nodeIps.size() < testResourcePool.getResources().size()) {
MSException.throwException(Translator.get("duplicate_node_ip")); MSException.throwException(Translator.get("duplicate_node_ip"));
} }
testResourcePool.setStatus(VALID.name());
for (TestResource resource : testResourcePool.getResources()) { for (TestResource resource : testResourcePool.getResources()) {
NodeDTO nodeDTO = JSON.parseObject(resource.getConfiguration(), NodeDTO.class); NodeDTO nodeDTO = JSON.parseObject(resource.getConfiguration(), NodeDTO.class);
boolean isValidate = validateNode(nodeDTO); boolean isValidate = validateNode(nodeDTO);
@ -134,6 +136,7 @@ public class TestResourcePoolService {
KubernetesProvider provider = new KubernetesProvider(testResource.getConfiguration()); KubernetesProvider provider = new KubernetesProvider(testResource.getConfiguration());
provider.validateCredential(); provider.validateCredential();
testResource.setStatus(VALID.name()); testResource.setStatus(VALID.name());
testResourcePool.setStatus(VALID.name());
} catch (Exception e) { } catch (Exception e) {
testResource.setStatus(ResourceStatusEnum.INVALID.name()); testResource.setStatus(ResourceStatusEnum.INVALID.name());
testResourcePool.setStatus(ResourceStatusEnum.INVALID.name()); testResourcePool.setStatus(ResourceStatusEnum.INVALID.name());
@ -161,6 +164,18 @@ public class TestResourcePoolService {
} }
public List<TestResourcePool> listValidResourcePools() { public List<TestResourcePool> listValidResourcePools() {
QueryResourcePoolRequest request = new QueryResourcePoolRequest();
List<TestResourcePoolDTO> testResourcePools = listResourcePools(request);
// 重新校验 pool
for (TestResourcePoolDTO pool : testResourcePools) {
try {
updateTestResourcePool(pool);
} catch (MSException e) {
pool.setStatus(INVALID.name());
pool.setUpdateTime(System.currentTimeMillis());
testResourcePoolMapper.updateByPrimaryKeySelective(pool);
}
}
TestResourcePoolExample example = new TestResourcePoolExample(); TestResourcePoolExample example = new TestResourcePoolExample();
example.createCriteria().andStatusEqualTo(ResourceStatusEnum.VALID.name()); example.createCriteria().andStatusEqualTo(ResourceStatusEnum.VALID.name());
return testResourcePoolMapper.selectByExample(example); return testResourcePoolMapper.selectByExample(example);