From d71ec3e89f332d29ac98044ccbc22779e1837340 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Wed, 29 May 2024 16:13:50 +0800 Subject: [PATCH] =?UTF-8?q?cloudTower=E7=94=B3=E8=AF=B7=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=9C=BA=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmp/entity/enums/CloudProvider.java | 2 +- .../com/bocloud/cmp/model/VolumeModel.java | 2 ++ .../cmp/model/common/ApplicationParam.java | 2 ++ .../cmp/model/common/AssignDataDiskParam.java | 28 ++++++++++++++++++ .../model/common/AssignDataDiskResult.java | 13 +++++++++ .../bocloud/cmp/model/common/AssignParam.java | 28 ++++++++++++++++++ .../cmp/model/common/AssignResult.java | 29 +++++++++++++++++++ .../bocloud/cmp/vm/model/CloudTowerDisk.java | 27 +++++++++++++++++ 8 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bocloud/cmp/model/common/AssignDataDiskParam.java create mode 100644 src/main/java/com/bocloud/cmp/model/common/AssignDataDiskResult.java create mode 100644 src/main/java/com/bocloud/cmp/model/common/AssignParam.java create mode 100644 src/main/java/com/bocloud/cmp/model/common/AssignResult.java create mode 100644 src/main/java/com/bocloud/cmp/vm/model/CloudTowerDisk.java diff --git a/src/main/java/com/bocloud/cmp/entity/enums/CloudProvider.java b/src/main/java/com/bocloud/cmp/entity/enums/CloudProvider.java index a2b5548..4b59ff7 100644 --- a/src/main/java/com/bocloud/cmp/entity/enums/CloudProvider.java +++ b/src/main/java/com/bocloud/cmp/entity/enums/CloudProvider.java @@ -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; + FUSIONSPHERE,EASYSTACK,SANGFOR,CLOUDTOWER; } diff --git a/src/main/java/com/bocloud/cmp/model/VolumeModel.java b/src/main/java/com/bocloud/cmp/model/VolumeModel.java index b1f3fb2..50c7f2f 100644 --- a/src/main/java/com/bocloud/cmp/model/VolumeModel.java +++ b/src/main/java/com/bocloud/cmp/model/VolumeModel.java @@ -168,6 +168,8 @@ public class VolumeModel { private String policyName; + private Integer disk; + public VolumeModel() { super(); } diff --git a/src/main/java/com/bocloud/cmp/model/common/ApplicationParam.java b/src/main/java/com/bocloud/cmp/model/common/ApplicationParam.java index 91afd77..dd175bc 100644 --- a/src/main/java/com/bocloud/cmp/model/common/ApplicationParam.java +++ b/src/main/java/com/bocloud/cmp/model/common/ApplicationParam.java @@ -73,4 +73,6 @@ public class ApplicationParam { */ private Long serverId; + + private AssignParam assignParam; } \ No newline at end of file diff --git a/src/main/java/com/bocloud/cmp/model/common/AssignDataDiskParam.java b/src/main/java/com/bocloud/cmp/model/common/AssignDataDiskParam.java new file mode 100644 index 0000000..bce0eb2 --- /dev/null +++ b/src/main/java/com/bocloud/cmp/model/common/AssignDataDiskParam.java @@ -0,0 +1,28 @@ +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(); +// } +} diff --git a/src/main/java/com/bocloud/cmp/model/common/AssignDataDiskResult.java b/src/main/java/com/bocloud/cmp/model/common/AssignDataDiskResult.java new file mode 100644 index 0000000..eab813f --- /dev/null +++ b/src/main/java/com/bocloud/cmp/model/common/AssignDataDiskResult.java @@ -0,0 +1,13 @@ +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; +} diff --git a/src/main/java/com/bocloud/cmp/model/common/AssignParam.java b/src/main/java/com/bocloud/cmp/model/common/AssignParam.java new file mode 100644 index 0000000..aaa6a69 --- /dev/null +++ b/src/main/java/com/bocloud/cmp/model/common/AssignParam.java @@ -0,0 +1,28 @@ +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 dataDiskParams; + private JSONObject originalConfigs; + + public Integer getInstance() { + if (Instance == null){ + Instance = 1; + } + return Instance; + } +} diff --git a/src/main/java/com/bocloud/cmp/model/common/AssignResult.java b/src/main/java/com/bocloud/cmp/model/common/AssignResult.java new file mode 100644 index 0000000..197aea1 --- /dev/null +++ b/src/main/java/com/bocloud/cmp/model/common/AssignResult.java @@ -0,0 +1,29 @@ +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 assignDataDiskResultList; + private JSONArray dataDiskList; + private JSONArray addDiskList; + private AssignParam assignParam; + + public JSONObject toJson(){ + return (JSONObject) JSON.toJSON(this); + } + +} diff --git a/src/main/java/com/bocloud/cmp/vm/model/CloudTowerDisk.java b/src/main/java/com/bocloud/cmp/vm/model/CloudTowerDisk.java new file mode 100644 index 0000000..4b180ed --- /dev/null +++ b/src/main/java/com/bocloud/cmp/vm/model/CloudTowerDisk.java @@ -0,0 +1,27 @@ +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; + +}