v1.6.4

CHANGELOG.md

@@ -1,52 +1,9 @@
-## Version 1.6.0
+## Version 1.6.4
 
 ### Bugfix
-- Fix client and legacy-client, the cyclicity of sending requests has been removed
-- Edit description field SSLSkipVerify in config/config and config/legacy-config
-- Remove tags required fields ExtNetID VINSID Start in model CreateRequest in cloudapi/lb/create and cloudbroker/lb/create
-- Add tags required fields BindingName BindingAddress BindingPort in model FrontendBindRequest in cloudapi/lb/frontend_bind 
-- Add tags required fields BindingAddress BindingPort in model FrontendBindUpdateRequest in cloudapi/lb/frontend_bind_update
-- Remove tags omitempty in field Start in model kvmx86 and kvmppc in cloudapi and cloudbroker /create /mass_create
-- Add field Driver in models cloudbroker/kvmx86/create and cloudbroker/kvmx86/create_blank
-- Add field ExternalIp in model ItemDetailedInfo cloudbroker/k8s/models and cloudapi/k8s/models 
-- Add fields StackID and Reason in model CreateRequest cloudbroker/kvmppc
-
-### Feature
-- Add field UserData in cloudapi/bservice/group_add
-- Add fields VinsId, LbSysctlParams, HighlyAvailable, AdditionalSANs, InitConfiguration, ClusterConfiguration, KubeletConfiguration, KubeProxyConfiguration, JoinConfiguration, UserData, ExtNetOnly, OidcCertificate in model request cloudapi/k8s/create and cloudbroker/k8s/create  
-- Add fields SysctlParams, HighlyAvailable in model CreateRequest in cloudapi/lb/create and cloudbroker/lb/create
-- Add fields BackendHAIP, FrontendHAIP, PartK8s, SysctlParams in model RecordLB in cloudapi/lb/models and cloudbroker/lb/models
-- Add models InfoStack, ItemStack, ListStacks cloudapi/stack/models
-- Add field Routes and type Route in CreateInAccountRequest and CreateInRGRequest models in cloudapi/vins/create_in_rg and /cloudapi/vins/create_in_account
-- Add field Enabled in model ItemVNFInterface in cloudapi/vins/models 
-- Add fields Routes in models RecordNAT, RecordDHCP, RecordGW and add type ListStaticRoutes, ListRoutes, ItemRoutes in cloudapi/vins/models 
-
-- Added new endpoints:
-- cloudapi/k8s/get_worker_nodes_meta_data
-- cloudapi/k8s/update_worker_nodes_meta_data
-- cloudapi/lb/make_highly_available
-- cloudapi/lb/updateSysctParams
-- cloudapi/stack/get
-- cloudapi/stack/list
-- cloudapi/vins/static_route_list
-- cloudapi/vins/static_route_access_grant
-- cloudapi/vins/static_route_access_revoke
-- cloudapi/vins/static_route_add
-- cloudapi/vins/static_route_del
-- cloudbroker/compute/set_custom_fields
-- cloudbroker/k8s/get_worker_nodes_meta_data
-- cloudbroker/k8s/update_worker_nodes_meta_data
-- cloudbroker/lb/make_highly_available
-- cloudbroker/lb/updateSysctParams
-- cloudbroker/vins/static_route_list
-- cloudbroker/vins/static_route_access_grant
-- cloudbroker/vins/static_route_access_revoke
-- cloudbroker/vins/static_route_add
-- cloudbroker/vins/static_route_del
-- cloudbroker/extnet/static_route_list
-- cloudbroker/extnet/static_route_access_grant
-- cloudbroker/extnet/static_route_access_revoke
-- cloudbroker/extnet/static_route_add
-- cloudbroker/extnet/static_route_del
-
-
+- Fixed type field DiskSizeMax in Resource model in cloudapi/account/models. Rename field ItemResourceConsumption model and rename json's tags in cloudapi/account/models
+- Rename field in ListPCIDeviceRequest model in cloudapi/compute/list_pci_device
+- Delete excess field in ListDeletedRequest model in cloudapi/k8s/list_deleted
+- Add fields Page and Size in AffinityGroupsListRequest model in cloudapi/lb/affinity_groups_list
+- Fixed type field Data in ListAffinityGroups model in cloudapi/lb/models
+- Rename in ItemResourceConsumption model json's tags in cloudapi/rg/models

client.go

@@ -151,7 +151,7 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCaCreateReq.WithLB))
 		}
 
-		_ = writer.WriteField("highlyAvailable", strconv.FormatBool(k8sCaCreateReq.HighlyAvailable))
+		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCaCreateReq.HighlyAvailable))
 
 		if k8sCaCreateReq.AdditionalSANs != nil {
 			for _, v := range k8sCaCreateReq.AdditionalSANs {
@@ -287,7 +287,7 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCbCreateReq.WithLB))
 		}
 
-		_ = writer.WriteField("highlyAvailable", strconv.FormatBool(k8sCbCreateReq.HighlyAvailable))
+		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCbCreateReq.HighlyAvailable))
 
 		if k8sCbCreateReq.AdditionalSANs != nil {
 			for _, v := range k8sCbCreateReq.AdditionalSANs {

legacy-client.go

@@ -148,7 +148,7 @@ func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url st
 			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCreateReq.WithLB))
 		}
 
-		_ = writer.WriteField("highlyAvailable", strconv.FormatBool(k8sCreateReq.HighlyAvailable))
+		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCreateReq.HighlyAvailable))
 
 		if k8sCreateReq.AdditionalSANs != nil {
 			for _, v := range k8sCreateReq.AdditionalSANs {

pkg/cloudapi/account/models.go

@@ -88,7 +88,7 @@ type Resource struct {
 	DiskSize float64 `json:"disksize"`
 
 	// Max disk size
-	DiskSizeMax uint64 `json:"disksizemax"`
+	DiskSizeMax float64 `json:"disksizemax"`
 
 	// Number of External IPs
 	ExtIPs int64 `json:"extips"`
@@ -126,10 +126,10 @@ type RecordResourceConsumption struct {
 // Information about resources
 type ItemResourceConsumption struct {
 	// Current information about resources
-	Current Resource `json:"Current"`
+	Consumed Resource `json:"consumed"`
 
 	// Reserved information about resources
-	Reserved Resource `json:"Reserved"`
+	Reserved Resource `json:"reserved"`
 
 	// Account ID
 	AccountID uint64 `json:"id"`

pkg/cloudapi/compute/list_pci_device.go

@@ -22,9 +22,9 @@ type ListPCIDeviceRequest struct {
 	// Required: false
 	DevID uint64 `url:"devId,omitempty" json:"devId,omitempty"`
 
-	// Find by type
+	// Find by name
 	// Required: false
-	Type string `url:"type,omitempty" json:"type,omitempty"`
+	Name string `url:"name,omitempty" json:"name,omitempty"`
 
 	// Find by status
 	// Required: false

pkg/cloudapi/k8s/create.go

@@ -115,7 +115,7 @@ type CreateRequest struct {
 
 	// Use Highly Available schema for LB deploy
 	// Required: false
-	HighlyAvailable bool `url:"highlyAvailable,omitempty" json:"highlyAvailable,omitempty"`
+	HighlyAvailable bool `url:"highlyAvailableLB,omitempty" json:"highlyAvailableLB,omitempty"`
 
 	// Optional extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names
 	// Required: false

pkg/cloudapi/k8s/list_deleted.go

@@ -32,10 +32,6 @@ type ListDeletedRequest struct {
 	// Required: false
 	BasicServiceID uint64 `url:"basicServiceId,omitempty" json:"basicServiceId,omitempty"`
 
-	// Find by status
-	// Required: false
-	Status string `url:"status,omitempty" json:"status,omitempty"`
-
 	// Find by techStatus
 	// Required: false
 	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`

pkg/cloudapi/lb/models.go

@@ -6,7 +6,7 @@ type RecordLB struct {
 	HAMode bool `json:"HAmode"`
 
 	// Access Control List
-	ACL []interface{} `json:"acl"`
+	ACL interface{} `json:"acl"`
 
 	// BackendHAIP
 	BackendHAIP string `json:"backendHAIP"`
@@ -78,7 +78,7 @@ type RecordLB struct {
 	Status string `json:"status"`
 
 	// Sysctl Params
-	SysctlParams []interface{} `json:"sysctlParams"`
+	SysctlParams interface{} `json:"sysctlParams"`
 
 	// Tech status
 	TechStatus string `json:"techStatus"`

pkg/cloudapi/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/cloudapi/rg/models.go

@@ -48,10 +48,10 @@ type Resources struct {
 // Detailed information about resource consumption
 type ItemResourceConsumption struct {
 	// Consumed information about resources
-	Consumed Resource `json:"Consumed"`
+	Consumed Resource `json:"consumed"`
 
 	// Reserved information about resources
-	Reserved Resource `json:"Reserved"`
+	Reserved Resource `json:"reserved"`
 
 	// Resource limits
 	ResourceLimits ResourceLimits `json:"resourceLimits"`
@@ -333,7 +333,7 @@ type ListAffinityGroupsComputes []ItemAffinityGroupComputes
 
 type ListAffinityGroups struct {
 	// Data
-	Data map[string][]uint64 `json:"data"`
+	Data []map[string][]uint64 `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`

pkg/cloudbroker/k8s/create.go

@@ -117,7 +117,7 @@ type CreateRequest struct {
 
 	// Use Highly Available schema for LB deploy
 	// Required: false
-	HighlyAvailable bool `url:"highlyAvailable,omitempty" json:"highlyAvailable,omitempty"`
+	HighlyAvailable bool `url:"highlyAvailableLB,omitempty" json:"highlyAvailableLB,omitempty"`
 
 	// Optional extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names
 	// Required: false

pkg/cloudbroker/lb/models.go

@@ -154,7 +154,7 @@ type RecordLB struct {
 	Meta []interface{} `json:"_meta"`
 
 	// Access Control List
-	ACL []interface{} `json:"acl"`
+	ACL interface{} `json:"acl"`
 
 	// BackendHAIP
 	BackendHAIP string `json:"backendHAIP"`
@@ -214,7 +214,7 @@ type RecordLB struct {
 	Status string `json:"status"`
 
 	// Sysctl Params
-	SysctlParams []string `json:"sysctlParams"`
+	SysctlParams interface{} `json:"sysctlParams"`
 
 	// Tech status
 	TechStatus string `json:"techStatus"`
@@ -229,7 +229,7 @@ type ItemLBList struct {
 	HAMode bool `json:"HAmode"`
 
 	// Access Control List
-	ACL []interface{} `json:"acl"`
+	ACL interface{} `json:"acl"`
 
 	// BackendHAIP
 	BackendHAIP string `json:"backendHAIP"`
@@ -298,7 +298,7 @@ type ItemLBList struct {
 	Status string `json:"status"`
 
 	// Sysctl Params
-	SysctlParams []string `json:"sysctlParams"`
+	SysctlParams interface{} `json:"sysctlParams"`
 
 	// Tech status
 	TechStatus string `json:"techStatus"`