BCC/BBC deploy set merge

baidubce · Feb 3, 2021 · 4659c12 · 4659c12
1 parent 8e1fd99
commit 4659c12
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/services/bbc/model.go b/services/bbc/model.go
@@ -459,6 +459,8 @@ type ListDeploySetsResult struct {
 type AzIntstanceStatis struct {
 	ZoneName string `json:"zoneName"`
 	Count    int    `json:"instanceCount"`
+	BbcCount int    `json:"bbcInstanceCnt"`
+	BccCount int    `json:"bccInstanceCnt"`
 	Total    int    `json:"instanceTotal"`
 }
 
@@ -724,10 +726,14 @@ type DeploySetResult struct {
 }
 
 type AzIntstanceStatisDetail struct {
-	ZoneName    string   `json:"zoneName"`
-	Count       int      `json:"instanceCount"`
-	Total       int      `json:"instanceTotal"`
-	InstanceIds []string `json:"instanceIds"`
+	ZoneName       string   `json:"zoneName"`
+	Count          int      `json:"instanceCount"`
+	BccCount       int      `json:"bccInstanceCnt"`
+	BbcCount       int      `json:"bbcInstanceCnt"`
+	Total          int      `json:"instanceTotal"`
+	InstanceIds    []string `json:"instanceIds"`
+	BccInstanceIds []string `json:"bccInstanceIds"`
+	BbcInstanceIds []string `json:"bbcInstanceIds"`
 }
 
 type BbcCreateAutoRenewArgs struct {

diff --git a/services/bcc/api/model.go b/services/bcc/api/model.go
@@ -1139,15 +1139,21 @@ type DeploySetResult struct {
 }
 
 type AzIntstanceStatisDetail struct {
-	ZoneName    string   `json:"zoneName"`
-	Count       int      `json:"instanceCount"`
-	Total       int      `json:"instanceTotal"`
-	InstanceIds []string `json:"instanceIds"`
+	ZoneName       string   `json:"zoneName"`
+	Count          int      `json:"instanceCount"`
+	BccCount       int      `json:"bccInstanceCnt"`
+	BbcCount       int      `json:"bbcInstanceCnt"`
+	Total          int      `json:"instanceTotal"`
+	InstanceIds    []string `json:"instanceIds"`
+	BccInstanceIds []string `json:"bccInstanceIds"`
+	BbcInstanceIds []string `json:"bbcInstanceIds"`
 }
 
 type AzIntstanceStatis struct {
 	ZoneName string `json:"zoneName"`
 	Count    int    `json:"instanceCount"`
+	BbcCount int    `json:"bbcInstanceCnt"`
+	BccCount int    `json:"bccInstanceCnt"`
 	Total    int    `json:"instanceTotal"`
 }