```禁用容器同步功能和数据库同步
parent
afa51ad6e5
commit
c790049073
|
@ -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()) {
|
||||||
|
@ -323,7 +322,7 @@ public class TianyiLocationProvider extends TianyiProvider {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
syncModel.setContainerClusterModels(containerClusterModels);
|
syncModel.setContainerClusterModels(containerClusterModels);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
// 同步云硬盘
|
// 同步云硬盘
|
||||||
log.info("获取云硬盘信息...");
|
log.info("获取云硬盘信息...");
|
||||||
|
@ -391,7 +390,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, "数据同步成功!");
|
||||||
|
|
Loading…
Reference in New Issue