v1.7.6

pkg/cloudbroker/rg/affinity_groups_list.go

@@ -13,6 +13,14 @@ type AffinityGroupsListRequest struct {
 	// Resource group ID
 	// Required: true
 	RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
+
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
 // AffinityGroupsList gets all currently defined affinity groups in this resource group with compute IDs

pkg/cloudbroker/rg/ids.go

@@ -53,3 +53,12 @@ func (lpfw ListPFW) IDs() []uint64 {
 	}
 	return res
 }
+
+// IDs gets array of ComputeIDs from ListAffinityGroupItems struct
+func (lag ListAffinityGroupItems) IDs() []uint64 {
+	res := make([]uint64, 0, len(lag))
+	for _, ag := range lag {
+		res = append(res, ag.ID)
+	}
+	return res
+}

pkg/cloudbroker/rg/list.go

@@ -36,6 +36,10 @@ type ListRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
+	// Find by status lock
+	// Required: false
+	LockStatus string `url:"lockStatus,omitempty" json:"lockStatus,omitempty"`
+
 	// Included deleted resource groups
 	// Required: false
 	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`

pkg/cloudbroker/rg/models.go

@@ -65,6 +65,10 @@ type ItemResourceConsumption struct {
 	// Reserved information
 	Reserved Reservation `json:"Reserved"`
 
+	// Resource limits
+	ResourceLimits ResourceLimits `json:"resourceLimits"`
+
+	// Resource group ID
 	RGID uint64 `json:"rgid"`
 }
 
@@ -603,6 +607,9 @@ type ItemLB struct {
 	// List ACL
 	ACL ListACL `json:"acl"`
 
+	// BackendHAIP
+	BackendHAIP string `json:"backendHAIP"`
+
 	// List backends
 	Backends ListBackends `json:"backends"`
 
@@ -627,6 +634,9 @@ type ItemLB struct {
 	// External network ID
 	ExtNetID uint64 `json:"extnetId"`
 
+	// FrontendHAIP
+	FrontendHAIP string `json:"frontendHAIP"`
+
 	// List of frontends
 	Frontends ListFrontends `json:"frontends"`
 
@@ -687,8 +697,15 @@ type ListLB struct {
 
 type ListAffinityGroup struct {
 	// Data
-	Data map[string][]uint64 `json:"data"`
+	Data []map[string]ListAffinityGroupItems `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
+
+type ListAffinityGroupItems []ItemAffinityGroup
+
+type ItemAffinityGroup struct {
+	ID     uint64 `json:"id"`
+	NodeID uint64 `json:"node_id"`
+}