Skip to content

Commit 386f1c8

Browse files
Merge pull request #192 from softlayer/20240523
20240523 Updates
2 parents 1882591 + 4142df4 commit 386f1c8

14 files changed

Lines changed: 318 additions & 583 deletions

.secrets.baseline

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2024-04-18T14:44:04Z",
6+
"generated_at": "2024-05-23T19:37:19Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -126,39 +126,39 @@
126126
"hashed_secret": "319f96013e95ce7556aa082a9dd58dce40aeff0f",
127127
"is_secret": false,
128128
"is_verified": false,
129-
"line_number": 1870,
129+
"line_number": 1877,
130130
"type": "Secret Keyword",
131131
"verified_result": null
132132
},
133133
{
134134
"hashed_secret": "fa9250fd74ad6c9f6737049b5bd842709fbf4ae3",
135135
"is_secret": false,
136136
"is_verified": false,
137-
"line_number": 1877,
137+
"line_number": 1884,
138138
"type": "Secret Keyword",
139139
"verified_result": null
140140
},
141141
{
142142
"hashed_secret": "bf9130647c179bd2b6992bcf2db4560b91bc513d",
143143
"is_secret": false,
144144
"is_verified": false,
145-
"line_number": 1884,
145+
"line_number": 1891,
146146
"type": "Secret Keyword",
147147
"verified_result": null
148148
},
149149
{
150150
"hashed_secret": "0f39e6d6c8aafa1e3e723d1b06aef02ead75b908",
151151
"is_secret": false,
152152
"is_verified": false,
153-
"line_number": 1891,
153+
"line_number": 1898,
154154
"type": "Secret Keyword",
155155
"verified_result": null
156156
},
157157
{
158158
"hashed_secret": "5487abf5507e25b18b47a3e8cd1ecfdea8c0e9e9",
159159
"is_secret": false,
160160
"is_verified": false,
161-
"line_number": 1898,
161+
"line_number": 1905,
162162
"type": "Secret Keyword",
163163
"verified_result": null
164164
}

datatypes/account.go

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,9 @@ type Account struct {
257257
// Private template group objects (parent and children) and the shared template group objects (parent only) for an account.
258258
BlockDeviceTemplateGroups []Virtual_Guest_Block_Device_Template_Group `json:"blockDeviceTemplateGroups,omitempty" xmlrpc:"blockDeviceTemplateGroups,omitempty"`
259259

260+
// Flag indicating whether this account is restricted from performing a self-service brand migration by updating their credit card details.
261+
BlockSelfServiceBrandMigration *bool `json:"blockSelfServiceBrandMigration,omitempty" xmlrpc:"blockSelfServiceBrandMigration,omitempty"`
262+
260263
// no documentation yet
261264
BluemixAccountId *string `json:"bluemixAccountId,omitempty" xmlrpc:"bluemixAccountId,omitempty"`
262265

@@ -423,13 +426,6 @@ type Account struct {
423426
// no documentation yet
424427
GlobalIpv6Records []Network_Subnet_IpAddress_Global `json:"globalIpv6Records,omitempty" xmlrpc:"globalIpv6Records,omitempty"`
425428

426-
// A count of [Deprecated] The global load balancer accounts for a softlayer customer account.
427-
GlobalLoadBalancerAccountCount *uint `json:"globalLoadBalancerAccountCount,omitempty" xmlrpc:"globalLoadBalancerAccountCount,omitempty"`
428-
429-
// [Deprecated] The global load balancer accounts for a softlayer customer account.
430-
// Deprecated: This function has been marked as deprecated.
431-
GlobalLoadBalancerAccounts []Network_LoadBalancer_Global_Account `json:"globalLoadBalancerAccounts,omitempty" xmlrpc:"globalLoadBalancerAccounts,omitempty"`
432-
433429
// An account's associated hardware objects.
434430
Hardware []Hardware `json:"hardware,omitempty" xmlrpc:"hardware,omitempty"`
435431

@@ -3082,3 +3078,17 @@ type Account_Status struct {
30823078
// no documentation yet
30833079
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
30843080
}
3081+
3082+
// no documentation yet
3083+
type Account_Status_Change_Reason struct {
3084+
Entity
3085+
3086+
// no documentation yet
3087+
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
3088+
3089+
// no documentation yet
3090+
KeyName *string `json:"keyName,omitempty" xmlrpc:"keyName,omitempty"`
3091+
3092+
// no documentation yet
3093+
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
3094+
}

datatypes/billing.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,16 +1522,6 @@ type Billing_Item_Network_LoadBalancer struct {
15221522
Billing_Item
15231523
}
15241524

1525-
// The global load balancer service has been deprecated and is no longer available.
1526-
//
1527-
// The SoftLayer_Billing_Item_Network_LoadBalancer_Global data type contains general information relating to a single SoftLayer billing item whose item category code is 'global_load_balancer'
1528-
type Billing_Item_Network_LoadBalancer_Global struct {
1529-
Billing_Item
1530-
1531-
// The resource for a global load balancer billing item.
1532-
Resource *Network_LoadBalancer_Global_Account `json:"resource,omitempty" xmlrpc:"resource,omitempty"`
1533-
}
1534-
15351525
// A SoftLayer_Billing_Item_Network_LoadBalancer_VirtualIpAddress represents the [[SoftLayer_Billing_Item|billing item]] related to a single [[SoftLayer_Network_LoadBalancer_VirtualIpAddress|load balancer]] instance.
15361526
type Billing_Item_Network_LoadBalancer_VirtualIpAddress struct {
15371527
Billing_Item

datatypes/container.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3946,19 +3946,6 @@ type Container_Product_Order_Network_LoadBalancer_AsAService struct {
39463946
UseSystemPublicIpPool *bool `json:"useSystemPublicIpPool,omitempty" xmlrpc:"useSystemPublicIpPool,omitempty"`
39473947
}
39483948

3949-
// The global load balancer service has been deprecated and is no longer available.
3950-
//
3951-
// This is the datatype that needs to be populated and sent to SoftLayer_Product_Order::placeOrder. This datatype has everything required to place a global load balancer order with SoftLayer.
3952-
type Container_Product_Order_Network_LoadBalancer_Global struct {
3953-
Container_Product_Order
3954-
3955-
// The domain name that will be load balanced.
3956-
Domain *string `json:"domain,omitempty" xmlrpc:"domain,omitempty"`
3957-
3958-
// The hostname that will be load balanced.
3959-
Hostname *string `json:"hostname,omitempty" xmlrpc:"hostname,omitempty"`
3960-
}
3961-
39623949
// This is the datatype that needs to be populated and sent to SoftLayer_Product_Order::placeOrder. This datatype has everything required to place a network message delivery order with SoftLayer.
39633950
type Container_Product_Order_Network_Message_Delivery struct {
39643951
Container_Product_Order

datatypes/location.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ type Location struct {
2727
BackboneDependentCount *uint `json:"backboneDependentCount,omitempty" xmlrpc:"backboneDependentCount,omitempty"`
2828

2929
// no documentation yet
30+
// Deprecated: This function has been marked as deprecated.
3031
BackboneDependents []Network_Backbone_Location_Dependent `json:"backboneDependents,omitempty" xmlrpc:"backboneDependents,omitempty"`
3132

3233
// A flag indicating whether or not the datacenter/location is BNPP compliant.

datatypes/network.go

Lines changed: 8 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -567,19 +567,22 @@ type Network_Backbone struct {
567567
// The unit portion of the bandwidth capacity of a SoftLayer backbone. For instance, if a backbone is rated at "10 G" capacity then the capacityUnits property of the backbone is "G".
568568
CapacityUnits *string `json:"capacityUnits,omitempty" xmlrpc:"capacityUnits,omitempty"`
569569

570-
// A backbone's status.
570+
// [Deprecated] A backbone's status.
571+
// Deprecated: This function has been marked as deprecated.
571572
Health *string `json:"health,omitempty" xmlrpc:"health,omitempty"`
572573

573574
// A backbone's internal identifier.
574575
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
575576

576-
// Which of the SoftLayer datacenters a backbone is connected to.
577+
// [Deprecated] Which of the SoftLayer datacenters a backbone is connected to.
578+
// Deprecated: This function has been marked as deprecated.
577579
Location *Location `json:"location,omitempty" xmlrpc:"location,omitempty"`
578580

579581
// A backbone's name. This is usually the name of the backbone's network provider followed by a number in case SoftLayer uses more than one backbone from a provider. Backbone provider numbers start with the number one and increment from there.
580582
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
581583

582-
// A backbone's primary network component.
584+
// [Deprecated] A backbone's primary network component.
585+
// Deprecated: This function has been marked as deprecated.
583586
NetworkComponent *Network_Component `json:"networkComponent,omitempty" xmlrpc:"networkComponent,omitempty"`
584587

585588
// The internal identifier of the network component that backbone is connected to.
@@ -594,6 +597,7 @@ type Network_Backbone_Location_Dependent struct {
594597
Entity
595598

596599
// no documentation yet
600+
// Deprecated: This function has been marked as deprecated.
597601
DependentLocation *Location `json:"dependentLocation,omitempty" xmlrpc:"dependentLocation,omitempty"`
598602

599603
// no documentation yet
@@ -603,6 +607,7 @@ type Network_Backbone_Location_Dependent struct {
603607
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
604608

605609
// no documentation yet
610+
// Deprecated: This function has been marked as deprecated.
606611
SourceLocation *Location `json:"sourceLocation,omitempty" xmlrpc:"sourceLocation,omitempty"`
607612

608613
// no documentation yet
@@ -1883,9 +1888,6 @@ type Network_Gateway_Member_Attribute struct {
18831888
// Username associated with the gateway.
18841889
Username *string `json:"username,omitempty" xmlrpc:"username,omitempty"`
18851890

1886-
// The vSRX version of the gateway software
1887-
VSRXVersion *string `json:"vSRXVersion,omitempty" xmlrpc:"vSRXVersion,omitempty"`
1888-
18891891
// The version of the gateway software
18901892
Version *string `json:"version,omitempty" xmlrpc:"version,omitempty"`
18911893

@@ -2738,104 +2740,6 @@ type Network_LBaaS_SessionAffinity struct {
27382740
Type *string `json:"type,omitempty" xmlrpc:"type,omitempty"`
27392741
}
27402742

2741-
// The global load balancer service has been deprecated and is no longer available.
2742-
type Network_LoadBalancer_Global_Account struct {
2743-
Entity
2744-
2745-
// Your SoftLayer customer account.
2746-
Account *Account `json:"account,omitempty" xmlrpc:"account,omitempty"`
2747-
2748-
// The maximum number of hosts that a global load balancer account is allowed to have.
2749-
AllowedNumberOfHosts *int `json:"allowedNumberOfHosts,omitempty" xmlrpc:"allowedNumberOfHosts,omitempty"`
2750-
2751-
// The average amount of connections per second used within the current billing cycle. This number is updated daily.
2752-
AverageConnectionsPerSecond *Float64 `json:"averageConnectionsPerSecond,omitempty" xmlrpc:"averageConnectionsPerSecond,omitempty"`
2753-
2754-
// The current billing item for a Global Load Balancer account.
2755-
BillingItem *Billing_Item `json:"billingItem,omitempty" xmlrpc:"billingItem,omitempty"`
2756-
2757-
// The amount of connections per second a global load balancer account may use within a billing cycle without being billed for an overage.
2758-
ConnectionsPerSecond *int `json:"connectionsPerSecond,omitempty" xmlrpc:"connectionsPerSecond,omitempty"`
2759-
2760-
// The IP address that will be return to a DNS request when none of the hosts for a global load balancer account could be returned.
2761-
FallbackIp *string `json:"fallbackIp,omitempty" xmlrpc:"fallbackIp,omitempty"`
2762-
2763-
// A count of the hosts in the load balancing pool for a global load balancer account.
2764-
HostCount *uint `json:"hostCount,omitempty" xmlrpc:"hostCount,omitempty"`
2765-
2766-
// The hostname of a global load balancer account that is being load balanced.
2767-
Hostname *string `json:"hostname,omitempty" xmlrpc:"hostname,omitempty"`
2768-
2769-
// The hosts in the load balancing pool for a global load balancer account.
2770-
Hosts []Network_LoadBalancer_Global_Host `json:"hosts,omitempty" xmlrpc:"hosts,omitempty"`
2771-
2772-
// The unique identifier of a global load balancer account.
2773-
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
2774-
2775-
// The load balance method of a global load balancer account
2776-
LoadBalanceType *Network_LoadBalancer_Global_Type `json:"loadBalanceType,omitempty" xmlrpc:"loadBalanceType,omitempty"`
2777-
2778-
// The identifier of the load balance method for a global load balancer account.
2779-
LoadBalanceTypeId *int `json:"loadBalanceTypeId,omitempty" xmlrpc:"loadBalanceTypeId,omitempty"`
2780-
2781-
// A flag indicating that the global load balancer is a managed resource.
2782-
ManagedResourceFlag *bool `json:"managedResourceFlag,omitempty" xmlrpc:"managedResourceFlag,omitempty"`
2783-
2784-
// Additional customer defined information for a global load balancer account.
2785-
Notes *string `json:"notes,omitempty" xmlrpc:"notes,omitempty"`
2786-
}
2787-
2788-
// The global load balancer service has been deprecated and is no longer available.
2789-
type Network_LoadBalancer_Global_Host struct {
2790-
Entity
2791-
2792-
// The IP address of the host that will be returned by the global load balancers in response to a dns request.
2793-
DestinationIp *string `json:"destinationIp,omitempty" xmlrpc:"destinationIp,omitempty"`
2794-
2795-
// The port of the host that will be used for health checks.
2796-
DestinationPort *int `json:"destinationPort,omitempty" xmlrpc:"destinationPort,omitempty"`
2797-
2798-
// Whether the host is enabled or not. The value can be '0' for disabled, or '1' for enabled.
2799-
Enabled *int `json:"enabled,omitempty" xmlrpc:"enabled,omitempty"`
2800-
2801-
// The health check type of a host. Valid values include 'none', 'http', and 'tcp'.
2802-
HealthCheck *string `json:"healthCheck,omitempty" xmlrpc:"healthCheck,omitempty"`
2803-
2804-
// The number of times the host was selected by the load balance method.
2805-
Hits *Float64 `json:"hits,omitempty" xmlrpc:"hits,omitempty"`
2806-
2807-
// The unique identifier of a global load balancer host.
2808-
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
2809-
2810-
// The order of this host within the load balance pool. This is only significant if the load balance method is set to failover.
2811-
LoadBalanceOrder *int `json:"loadBalanceOrder,omitempty" xmlrpc:"loadBalanceOrder,omitempty"`
2812-
2813-
// The global load balancer account a host belongs to.
2814-
LoadBalancerAccount *Network_LoadBalancer_Global_Account `json:"loadBalancerAccount,omitempty" xmlrpc:"loadBalancerAccount,omitempty"`
2815-
2816-
// The location of a host in a datacenter.serverRoom format.
2817-
Location *string `json:"location,omitempty" xmlrpc:"location,omitempty"`
2818-
2819-
// The health status of a host. The status can be either 'UP', 'DOWN', or null which could mean that the health check type is set to 'none' or an update to the ip, port, or health check type was recently done and the host is waiting for the new status.
2820-
Status *string `json:"status,omitempty" xmlrpc:"status,omitempty"`
2821-
2822-
// The load balance weight of a host. The total weight of all hosts in the load balancing pool must not exceed 100.
2823-
Weight *int `json:"weight,omitempty" xmlrpc:"weight,omitempty"`
2824-
}
2825-
2826-
// The global load balancer service has been deprecated and is no longer available.
2827-
//
2828-
// The SoftLayer_Network_LoadBalancer_Global_Type data type represents a single load balance method that can be assigned to a global load balancer account. The load balance method determines how hosts in a load balancing pool are chosen by the global load balancers.
2829-
type Network_LoadBalancer_Global_Type struct {
2830-
Entity
2831-
2832-
// The unique identifier of a load balance method.
2833-
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
2834-
2835-
// The name of a load balance method.
2836-
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
2837-
}
2838-
28392743
// The SoftLayer_Network_LoadBalancer_Service data type contains all the information relating to a specific service (destination) on a particular load balancer.
28402744
//
28412745
// Information retained on the object itself is the the source and destination of the service, routing type, weight, and whether or not the service is currently enabled.

services/account.go

Lines changed: 60 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,12 @@ func (r Account) GetBlockDeviceTemplateGroups() (resp []datatypes.Virtual_Guest_
537537
return
538538
}
539539

540+
// Retrieve Flag indicating whether this account is restricted from performing a self-service brand migration by updating their credit card details.
541+
func (r Account) GetBlockSelfServiceBrandMigration() (resp bool, err error) {
542+
err = r.Session.DoRequest("SoftLayer_Account", "getBlockSelfServiceBrandMigration", nil, &r.Options, &resp)
543+
return
544+
}
545+
540546
// Retrieve
541547
func (r Account) GetBluemixAccountId() (resp string, err error) {
542548
err = r.Session.DoRequest("SoftLayer_Account", "getBluemixAccountId", nil, &r.Options, &resp)
@@ -747,12 +753,6 @@ func (r Account) GetGlobalIpv6Records() (resp []datatypes.Network_Subnet_IpAddre
747753
return
748754
}
749755

750-
// Retrieve [Deprecated] The global load balancer accounts for a softlayer customer account.
751-
func (r Account) GetGlobalLoadBalancerAccounts() (resp []datatypes.Network_LoadBalancer_Global_Account, err error) {
752-
err = r.Session.DoRequest("SoftLayer_Account", "getGlobalLoadBalancerAccounts", nil, &r.Options, &resp)
753-
return
754-
}
755-
756756
// Retrieve An account's associated hardware objects.
757757
func (r Account) GetHardware() (resp []datatypes.Hardware, err error) {
758758
err = r.Session.DoRequest("SoftLayer_Account", "getHardware", nil, &r.Options, &resp)
@@ -3505,9 +3505,10 @@ func (r Account_Lockdown_Request) CancelRequest() (err error) {
35053505
}
35063506

35073507
// Takes the original lockdown request ID, and an optional disable date. If no date is passed with the API call, the account will be disabled immediately. Otherwise, the account will be disabled on the date given. All hardware will be reclaimed and all accounts permanently disabled.
3508-
func (r Account_Lockdown_Request) DisableLockedAccount(disableDate *string) (resp int, err error) {
3508+
func (r Account_Lockdown_Request) DisableLockedAccount(disableDate *string, statusChangeReasonKeyName *string) (resp int, err error) {
35093509
params := []interface{}{
35103510
disableDate,
3511+
statusChangeReasonKeyName,
35113512
}
35123513
err = r.Session.DoRequest("SoftLayer_Account_Lockdown_Request", "disableLockedAccount", params, &r.Options, &resp)
35133514
return
@@ -5580,3 +5581,55 @@ func (r Account_Shipment_Type) GetObject() (resp datatypes.Account_Shipment_Type
55805581
err = r.Session.DoRequest("SoftLayer_Account_Shipment_Type", "getObject", nil, &r.Options, &resp)
55815582
return
55825583
}
5584+
5585+
// no documentation yet
5586+
type Account_Status_Change_Reason struct {
5587+
Session session.SLSession
5588+
Options sl.Options
5589+
}
5590+
5591+
// GetAccountStatusChangeReasonService returns an instance of the Account_Status_Change_Reason SoftLayer service
5592+
func GetAccountStatusChangeReasonService(sess session.SLSession) Account_Status_Change_Reason {
5593+
return Account_Status_Change_Reason{Session: sess}
5594+
}
5595+
5596+
func (r Account_Status_Change_Reason) Id(id int) Account_Status_Change_Reason {
5597+
r.Options.Id = &id
5598+
return r
5599+
}
5600+
5601+
func (r Account_Status_Change_Reason) Mask(mask string) Account_Status_Change_Reason {
5602+
if !strings.HasPrefix(mask, "mask[") && (strings.Contains(mask, "[") || strings.Contains(mask, ",")) {
5603+
mask = fmt.Sprintf("mask[%s]", mask)
5604+
}
5605+
5606+
r.Options.Mask = mask
5607+
return r
5608+
}
5609+
5610+
func (r Account_Status_Change_Reason) Filter(filter string) Account_Status_Change_Reason {
5611+
r.Options.Filter = filter
5612+
return r
5613+
}
5614+
5615+
func (r Account_Status_Change_Reason) Limit(limit int) Account_Status_Change_Reason {
5616+
r.Options.Limit = &limit
5617+
return r
5618+
}
5619+
5620+
func (r Account_Status_Change_Reason) Offset(offset int) Account_Status_Change_Reason {
5621+
r.Options.Offset = &offset
5622+
return r
5623+
}
5624+
5625+
// no documentation yet
5626+
func (r Account_Status_Change_Reason) GetAllObjects() (resp []datatypes.Account_Status_Change_Reason, err error) {
5627+
err = r.Session.DoRequest("SoftLayer_Account_Status_Change_Reason", "getAllObjects", nil, &r.Options, &resp)
5628+
return
5629+
}
5630+
5631+
// no documentation yet
5632+
func (r Account_Status_Change_Reason) GetObject() (resp datatypes.Account_Status_Change_Reason, err error) {
5633+
err = r.Session.DoRequest("SoftLayer_Account_Status_Change_Reason", "getObject", nil, &r.Options, &resp)
5634+
return
5635+
}

0 commit comments

Comments
 (0)