iidi
/
bocloud.cloud.plugin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: iidi:82c636571ea77d3f4ac3c22f68981d298610bf00
Branches Tags
iidi:develop
iidi:iida
..
compare: iidi:5c019b2c1695e7ad9a186790f41c95201872723f
Branches Tags
iidi:develop
iidi:iida

2 Commits
82c636571e ... 5c019b2c16

Author SHA1 Message Date
yuemian 5c019b2c16 Merge remote-tracking branch 'origin/develop' into develop 2024-09-12 15:14:05 +08:00
yuemian c790049073 ```禁用容器同步功能和数据库同步 2024-09-12 15:13:34 +08:00
1 changed files with 8 additions and 9 deletions
Show Stats Expand all files Collapse all files

17
bocloud.ctstack.plugin/src/main/java/com/bocloud/ctstack/plugin/provider/common/TianyiLocationProvider.java
View File

@ -5,17 +5,12 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.bocloud.cmp.domain.Butler; import com.bocloud.cmp.domain.Butler;
import com.bocloud.ctstack.plugin.domain.model.*; import com.bocloud.ctstack.plugin.domain.model.*;
import com.bocloud.ctstack.plugin.domain.model.container.ContainerClusterModel;
import com.bocloud.ctstack.plugin.domain.model.container.ContainerNodeModel;
import com.bocloud.ctstack.plugin.domain.model.container.ContainerNodePoolModel;
import com.bocloud.ctstack.plugin.domain.model.database.ProjectModel; import com.bocloud.ctstack.plugin.domain.model.database.ProjectModel;
import com.bocloud.ctstack.plugin.domain.model.database.RdsModel; import com.bocloud.ctstack.plugin.domain.model.database.RdsModel;
import com.bocloud.ctstack.plugin.provider.TianyiProvider; import com.bocloud.ctstack.plugin.provider.TianyiProvider;
import com.bocloud.ctstack.plugin.provider.compute.TianyiImageProvider; import com.bocloud.ctstack.plugin.provider.compute.TianyiImageProvider;
import com.bocloud.ctstack.plugin.provider.compute.TianyiPhysicalProvider; import com.bocloud.ctstack.plugin.provider.compute.TianyiPhysicalProvider;
import com.bocloud.ctstack.plugin.provider.compute.TianyiServerProvider; import com.bocloud.ctstack.plugin.provider.compute.TianyiServerProvider;
import com.bocloud.ctstack.plugin.provider.container.TianYiContainerClusterProvider;
import com.bocloud.ctstack.plugin.provider.container.TianYiContainerNodeProvider;
import com.bocloud.ctstack.plugin.provider.database.TianyiRdsProvider; import com.bocloud.ctstack.plugin.provider.database.TianyiRdsProvider;
import com.bocloud.ctstack.plugin.provider.network.TianyiFloatingIpProvider; import com.bocloud.ctstack.plugin.provider.network.TianyiFloatingIpProvider;
import com.bocloud.ctstack.plugin.provider.network.TianyiSecurityGroupProvider; import com.bocloud.ctstack.plugin.provider.network.TianyiSecurityGroupProvider;
@ -35,7 +30,11 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -299,7 +298,7 @@ public class TianyiLocationProvider extends TianyiProvider {
// 同步容器 // 同步容器
log.info("获取容器信息..."); log.info("获取容器信息...");
TianYiContainerClusterProvider tianYiContainerClusterProvider = new TianYiContainerClusterProvider(this.getButler()); /*TianYiContainerClusterProvider tianYiContainerClusterProvider = new TianYiContainerClusterProvider(this.getButler());
GeneralResult containerClusterList = tianYiContainerClusterProvider.list(); GeneralResult containerClusterList = tianYiContainerClusterProvider.list();
log.info("同步容器结果:{}",containerClusterList.isSuccess()); log.info("同步容器结果:{}",containerClusterList.isSuccess());
if (containerClusterList.isSuccess()) { if (containerClusterList.isSuccess()) {
@ -315,7 +314,7 @@ public class TianyiLocationProvider extends TianyiProvider {
} }
} }
syncModel.setContainerClusterModels(containerClusterModels); syncModel.setContainerClusterModels(containerClusterModels);
} }*/
// 同步云硬盘 // 同步云硬盘
log.info("获取云硬盘信息..."); log.info("获取云硬盘信息...");
@ -383,7 +382,7 @@ public class TianyiLocationProvider extends TianyiProvider {
} }
log.info("同步资源池信息:{}",poolModelGeneralResult.isSuccess()); log.info("同步资源池信息:{}",poolModelGeneralResult.isSuccess());
syncRds(syncModel); //syncRds(syncModel);
log.info("end sync ... current region is " + this.getRegionId()); log.info("end sync ... current region is " + this.getRegionId());
return new GeneralResult(true, syncModel, "数据同步成功！"); return new GeneralResult(true, syncModel, "数据同步成功！");