hbcl
/
bocloud.public.provider
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hbcl:develop
Branches Tags
hbcl:develop
hbcl:master
..
compare: hbcl:master
Branches Tags
hbcl:develop
hbcl:master

No commits in common. "develop" and "master" have entirely different histories.
develop ... master

15 changed files with 1 additions and 182 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/bocloud/cmp/entity/enums/CloudProvider.java
View File

@ -12,5 +12,5 @@ public enum CloudProvider {
OPENSTACK, VMWARE, ALIYUN, JDCLOUD, UNKNOWN, SCP, H3C, HMC, FUSIONCLOUD, TENCENT, F5, HUAWEI, XEN, POWERVC,
CLOUDOS, AZURE, KINGCLOUD, KUBERNETES, AWS, QCLOUD, TCE, PQCLOUD, MANAGEONE,
JUMPSERVER, HORIZON, TIANYI, HILLSTONE, CISCO, AGILE, NSX, CAMPUS, HCSO, VEEAM, SMARTX, VOLCENGINE,
FUSIONSPHERE,EASYSTACK,SANGFOR,CLOUDTOWER;
FUSIONSPHERE,EASYSTACK,SANGFOR;
}

2
src/main/java/com/bocloud/cmp/model/HostModel.java
View File

@ -100,8 +100,6 @@ public class HostModel {
//-----FusionSphere新增字段--------//
private Long totalCacheSizeByte;
public Long getCpuHz() {
return cpuHz;

20
src/main/java/com/bocloud/cmp/model/NetworkModel.java
View File

@ -34,26 +34,6 @@ public class NetworkModel {
private Long vendorId;
private Long region;
private String clusterUuid;
private String localId;
public String getLocalId() {
return localId;
}
public void setLocalId(String localId) {
this.localId = localId;
}
public String getClusterUuid() {
return clusterUuid;
}
public void setClusterUuid(String clusterUuid) {
this.clusterUuid = clusterUuid;
}
public String getRegionId() {
return regionId;
}

2
src/main/java/com/bocloud/cmp/model/ServerModel.java
View File

@ -327,8 +327,6 @@ public class ServerModel implements VendorModel {
private String resourceId;//资源池Id
private Boolean powerOn;//创建完成后是否启动
private String localId;
@Override
public Serializable getIdInVendor(String s) {
return this.instanceId;

10
src/main/java/com/bocloud/cmp/model/SwitcherModel.java
View File

@ -24,16 +24,6 @@ public class SwitcherModel {
private NetworkModel network;
private List<NetworkModel> networks;
private String clusterUuid;
public String getClusterUuid() {
return clusterUuid;
}
public void setClusterUuid(String clusterUuid) {
this.clusterUuid = clusterUuid;
}
public String getBondName() {
return bondName;
}

4
src/main/java/com/bocloud/cmp/model/VolumeModel.java
View File

@ -166,10 +166,6 @@ public class VolumeModel {
private Long dataStoreId;// 数据存储
//fc新增字段
private String policyName;
private Integer disk;
public VolumeModel() {
super();
}

2
src/main/java/com/bocloud/cmp/model/common/ApplicationParam.java
View File

@ -73,6 +73,4 @@ public class ApplicationParam {
*/
private Long serverId;
private AssignParam assignParam;
}

28
src/main/java/com/bocloud/cmp/model/common/AssignDataDiskParam.java
View File

@ -1,28 +0,0 @@
package com.bocloud.cmp.model.common;
import com.bocloud.cmp.model.VolumeModel;
import com.bocloud.cmp.vm.model.CloudTowerDisk;
import lombok.Data;
@Data
public class AssignDataDiskParam {
private Long size;
private VolumeModel originalVolumeModel;
public AssignDataDiskParam() {
}
// public AssignDataDiskParam(ArcherOsDisk archerOsDisk){
// this.size = archerOsDisk.getSize();
// }
public AssignDataDiskParam(CloudTowerDisk cloudTowerDisk) {
this.size = cloudTowerDisk.getSize();
}
// public AssignDataDiskParam(VmwareDisk vmwareDisk) {
// this.size = vmwareDisk.getDisk();
// }
}

13
src/main/java/com/bocloud/cmp/model/common/AssignDataDiskResult.java
View File

@ -1,13 +0,0 @@
package com.bocloud.cmp.model.common;
import lombok.Data;
@Data
public class AssignDataDiskResult {
private Long storeId;
private Long hostId;
private Long size;
private String storeName;
private String storeDeviceUuid;
private AssignDataDiskParam assignDataDiskParam;
}

28
src/main/java/com/bocloud/cmp/model/common/AssignParam.java
View File

@ -1,28 +0,0 @@
package com.bocloud.cmp.model.common;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import java.util.List;
@Data
public class AssignParam {
private String uuid;
private Long Cpu;
private Long Memory;
private Long Disk;
private Integer Instance;
private Integer remain;
private Long poolGroupId;
private Long templateDisk;
private List<AssignDataDiskParam> dataDiskParams;
private JSONObject originalConfigs;
public Integer getInstance() {
if (Instance == null){
Instance = 1;
}
return Instance;
}
}

29
src/main/java/com/bocloud/cmp/model/common/AssignResult.java
View File

@ -1,29 +0,0 @@
package com.bocloud.cmp.model.common;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import java.util.List;
@Data
public class AssignResult {
private Boolean success;
private Long storeId;
private Long hostId;
private Long vdcId;
private String assignId;
private Long clusterId;
private List<AssignDataDiskResult> assignDataDiskResultList;
private JSONArray dataDiskList;
private JSONArray addDiskList;
private AssignParam assignParam;
public JSONObject toJson(){
return (JSONObject) JSON.toJSON(this);
}
}

1
src/main/java/com/bocloud/cmp/model/smart/SyncModel.java
View File

@ -21,7 +21,6 @@ public class SyncModel {
private List<VolumeTemplateModel> volumeTemplateModels;
private List<ImageModel> imageModels;
private List<TaskMsgModel> taskMsgModels;
private List<ClusterModel> clusterModels;
public List<ServerModel> getServerAndServerTemplateModels() {
List<ServerModel> resultModels = new ArrayList<>(this.serverModels);

5
src/main/java/com/bocloud/cmp/provider/compute/ClusterProvider.java
View File

@ -5,8 +5,6 @@ import com.bocloud.cmp.model.ClusterOperateModel;
import com.bocloud.cmp.provider.SuperProvider;
import com.bocloud.common.model.BocloudResult;
import java.util.List;
/**
* 集群操作接口
*
@ -87,9 +85,6 @@ public interface ClusterProvider extends SuperProvider {
default BocloudResult listByVdc(String vdcName) {
return null;
}
default BocloudResult<List<ClusterModel>> getClusterByVlanId(String vlanId) {
return null;
}
default BocloudResult resourceStatistics(String uri) {
return null;

10
src/main/java/com/bocloud/cmp/provider/compute/ServerProvider.java
View File

@ -132,16 +132,6 @@ public interface ServerProvider extends SuperProvider {
return new BocloudResult(false, "尚未实现");
}
default BocloudResult addNetwork(ServerModel server) {
return new BocloudResult(false, "尚未实现");
};
default BocloudResult removeNetwork(ServerModel server) {
return new BocloudResult(false, "尚未实现");
};
default BocloudResult addDisks(ServerModel server) {
return new BocloudResult(false, "尚未实现");
};
/**
* 软停止云主机
*

27
src/main/java/com/bocloud/cmp/vm/model/CloudTowerDisk.java
View File

@ -1,27 +0,0 @@
package com.bocloud.cmp.vm.model;
import lombok.Data;
@Data
public class CloudTowerDisk {
// {
// "categoryId": 38,
// "disk": "100",
// "size": "100",
// "type": "newDisk",
// "category": null,
// "bus": "VIRTIO",
// "volumeTemplateId": 21,
// "volumeTemplateName": "REPLICA_2_THICK_PROVISION"
// }
private Long categoryId;
private Long disk;
private Long size;
private String type;
private String category;
private String bus;
private Long volumeTemplateId;
private String volumeTemplateName;
}