Skip to content

Commit

Permalink
Merge pull request #196 from softlayer/20240925
Browse files Browse the repository at this point in the history 
20240925 updates
  • Loading branch information
@allmightyspiff
allmightyspiff authored Sep 26, 2024
2 parents 129de40 + 67b1283 commit 91ee005
Show file tree
Hide file tree
Showing 14 changed files with 169 additions and 186 deletions.
10 changes: 5 additions & 5 deletions .secrets.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2024-09-24T20:48:27Z",
"generated_at": "2024-09-25T22:48:22Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -92,31 +92,31 @@
"hashed_secret": "c218236f2825f6fc9d2ffb100becad199c5961ed",
"is_secret": false,
"is_verified": false,
"line_number": 3934,
"line_number": 3906,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "28b386cf9ad560231594007df15c06ac60d34e9a",
"is_secret": false,
"is_verified": false,
"line_number": 3941,
"line_number": 3913,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "bf9130647c179bd2b6992bcf2db4560b91bc513d",
"is_secret": false,
"is_verified": false,
"line_number": 3948,
"line_number": 3920,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "514e1c9ca3e832486f7d88c45a4ea453bfe7f9bf",
"is_secret": false,
"is_verified": false,
"line_number": 3955,
"line_number": 3927,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
51 changes: 13 additions & 38 deletions datatypes/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,11 @@ type Account struct {
// no documentation yet
ActiveCatalystEnrollment *Catalyst_Enrollment `json:"activeCatalystEnrollment,omitempty" xmlrpc:"activeCatalystEnrollment,omitempty"`

// A count of the account's active top level colocation containers.
// A count of deprecated.
ActiveColocationContainerCount *uint `json:"activeColocationContainerCount,omitempty" xmlrpc:"activeColocationContainerCount,omitempty"`

// The account's active top level colocation containers.
// Deprecated.
// Deprecated: This function has been marked as deprecated.
ActiveColocationContainers []Billing_Item `json:"activeColocationContainers,omitempty" xmlrpc:"activeColocationContainers,omitempty"`

// [Deprecated] Please use SoftLayer_Account::activeFlexibleCreditEnrollments.
Expand Down Expand Up @@ -651,13 +652,6 @@ type Account struct {
// An account's latest recurring pending invoice.
LatestRecurringPendingInvoice *Billing_Invoice `json:"latestRecurringPendingInvoice,omitempty" xmlrpc:"latestRecurringPendingInvoice,omitempty"`

// A count of [DEPRECATED] The legacy bandwidth allotments for an account.
LegacyBandwidthAllotmentCount *uint `json:"legacyBandwidthAllotmentCount,omitempty" xmlrpc:"legacyBandwidthAllotmentCount,omitempty"`

// [DEPRECATED] The legacy bandwidth allotments for an account.
// Deprecated: This function has been marked as deprecated.
LegacyBandwidthAllotments []Network_Bandwidth_Version1_Allotment `json:"legacyBandwidthAllotments,omitempty" xmlrpc:"legacyBandwidthAllotments,omitempty"`

// The total capacity of Legacy iSCSI Volumes on an account, in GB.
LegacyIscsiCapacityGB *uint `json:"legacyIscsiCapacityGB,omitempty" xmlrpc:"legacyIscsiCapacityGB,omitempty"`

Expand Down Expand Up @@ -691,10 +685,6 @@ type Account struct {
// An account's media transfer service requests.
MediaDataTransferRequests []Account_Media_Data_Transfer_Request `json:"mediaDataTransferRequests,omitempty" xmlrpc:"mediaDataTransferRequests,omitempty"`

// [DEPRECATED] - An accounts metric tracking object. This object records all periodic polled data available to this account.
// Deprecated: This function has been marked as deprecated.
MetricTrackingObject *Metric_Tracking_Object `json:"metricTrackingObject,omitempty" xmlrpc:"metricTrackingObject,omitempty"`

// Flag indicating whether this account is restricted to the IBM Cloud portal.
MigratedToIbmCloudPortalFlag *bool `json:"migratedToIbmCloudPortalFlag,omitempty" xmlrpc:"migratedToIbmCloudPortalFlag,omitempty"`

Expand Down Expand Up @@ -803,16 +793,12 @@ type Account struct {
// All network VLANs assigned to an account.
NetworkVlans []Network_Vlan `json:"networkVlans,omitempty" xmlrpc:"networkVlans,omitempty"`

// A count of dEPRECATED - This information can be pulled directly through tapping keys now - DEPRECATED. The allotments for this account and their servers for the next billing cycle. The public inbound and outbound bandwidth is calculated for each server in addition to the daily average network traffic since the last billing date.
NextBillingPublicAllotmentHardwareBandwidthDetailCount *uint `json:"nextBillingPublicAllotmentHardwareBandwidthDetailCount,omitempty" xmlrpc:"nextBillingPublicAllotmentHardwareBandwidthDetailCount,omitempty"`

// DEPRECATED - This information can be pulled directly through tapping keys now - DEPRECATED. The allotments for this account and their servers for the next billing cycle. The public inbound and outbound bandwidth is calculated for each server in addition to the daily average network traffic since the last billing date.
// Deprecated: This function has been marked as deprecated.
NextBillingPublicAllotmentHardwareBandwidthDetails []Network_Bandwidth_Version1_Allotment `json:"nextBillingPublicAllotmentHardwareBandwidthDetails,omitempty" xmlrpc:"nextBillingPublicAllotmentHardwareBandwidthDetails,omitempty"`

// The pre-tax total amount exempt from incubator credit for the account's next invoice. This field is now deprecated and will soon be removed. Please update all references to instead use nextInvoiceTotalAmount
NextInvoiceIncubatorExemptTotal *Float64 `json:"nextInvoiceIncubatorExemptTotal,omitempty" xmlrpc:"nextInvoiceIncubatorExemptTotal,omitempty"`

// The pre-tax platform services total amount of an account's next invoice.
NextInvoicePlatformServicesTotalAmount *Float64 `json:"nextInvoicePlatformServicesTotalAmount,omitempty" xmlrpc:"nextInvoicePlatformServicesTotalAmount,omitempty"`

// The total recurring charge amount of an account's next invoice eligible for account discount measured in US Dollars ($USD), assuming no changes or charges occur between now and time of billing.
NextInvoiceRecurringAmountEligibleForAccountDiscount *Float64 `json:"nextInvoiceRecurringAmountEligibleForAccountDiscount,omitempty" xmlrpc:"nextInvoiceRecurringAmountEligibleForAccountDiscount,omitempty"`

Expand Down Expand Up @@ -1026,6 +1012,12 @@ type Account struct {
// An account's associated portal users with PPTP VPN access. (Deprecated)
PptpVpnUsers []User_Customer `json:"pptpVpnUsers,omitempty" xmlrpc:"pptpVpnUsers,omitempty"`

// A count of an account's invoices in the PRE_OPEN status.
PreOpenRecurringInvoiceCount *uint `json:"preOpenRecurringInvoiceCount,omitempty" xmlrpc:"preOpenRecurringInvoiceCount,omitempty"`

// An account's invoices in the PRE_OPEN status.
PreOpenRecurringInvoices []Billing_Invoice `json:"preOpenRecurringInvoices,omitempty" xmlrpc:"preOpenRecurringInvoices,omitempty"`

// The total recurring amount for an accounts previous revenue.
PreviousRecurringRevenue *Float64 `json:"previousRecurringRevenue,omitempty" xmlrpc:"previousRecurringRevenue,omitempty"`

Expand All @@ -1041,13 +1033,6 @@ type Account struct {
// All priority one tickets associated with an account.
PriorityOneTickets []Ticket `json:"priorityOneTickets,omitempty" xmlrpc:"priorityOneTickets,omitempty"`

// A count of dEPRECATED - This information can be pulled directly through tapping keys now - DEPRECATED. The allotments for this account and their servers. The private inbound and outbound bandwidth is calculated for each server in addition to the daily average network traffic since the last billing date.
PrivateAllotmentHardwareBandwidthDetailCount *uint `json:"privateAllotmentHardwareBandwidthDetailCount,omitempty" xmlrpc:"privateAllotmentHardwareBandwidthDetailCount,omitempty"`

// DEPRECATED - This information can be pulled directly through tapping keys now - DEPRECATED. The allotments for this account and their servers. The private inbound and outbound bandwidth is calculated for each server in addition to the daily average network traffic since the last billing date.
// Deprecated: This function has been marked as deprecated.
PrivateAllotmentHardwareBandwidthDetails []Network_Bandwidth_Version1_Allotment `json:"privateAllotmentHardwareBandwidthDetails,omitempty" xmlrpc:"privateAllotmentHardwareBandwidthDetails,omitempty"`

// A count of private and shared template group objects (parent only) for an account.
PrivateBlockDeviceTemplateGroupCount *uint `json:"privateBlockDeviceTemplateGroupCount,omitempty" xmlrpc:"privateBlockDeviceTemplateGroupCount,omitempty"`

Expand Down Expand Up @@ -1075,13 +1060,6 @@ type Account struct {
// Boolean flag indicating whether or not this account is a Proof of Concept account.
ProofOfConceptAccountFlag *bool `json:"proofOfConceptAccountFlag,omitempty" xmlrpc:"proofOfConceptAccountFlag,omitempty"`

// A count of dEPRECATED - This information can be pulled directly through tapping keys now - DEPRECATED. The allotments for this account and their servers. The public inbound and outbound bandwidth is calculated for each server in addition to the daily average network traffic since the last billing date.
PublicAllotmentHardwareBandwidthDetailCount *uint `json:"publicAllotmentHardwareBandwidthDetailCount,omitempty" xmlrpc:"publicAllotmentHardwareBandwidthDetailCount,omitempty"`

// DEPRECATED - This information can be pulled directly through tapping keys now - DEPRECATED. The allotments for this account and their servers. The public inbound and outbound bandwidth is calculated for each server in addition to the daily average network traffic since the last billing date.
// Deprecated: This function has been marked as deprecated.
PublicAllotmentHardwareBandwidthDetails []Network_Bandwidth_Version1_Allotment `json:"publicAllotmentHardwareBandwidthDetails,omitempty" xmlrpc:"publicAllotmentHardwareBandwidthDetails,omitempty"`

// A count of
PublicIpAddressCount *uint `json:"publicIpAddressCount,omitempty" xmlrpc:"publicIpAddressCount,omitempty"`

Expand Down Expand Up @@ -1322,9 +1300,6 @@ type Account struct {
// Stored security certificates that are not expired (ie. SSL)
ValidSecurityCertificates []Security_Certificate `json:"validSecurityCertificates,omitempty" xmlrpc:"validSecurityCertificates,omitempty"`

// DEPRECATED - Return 0 if VDR updates are currently in progress on this account otherwise 1.
VdrUpdatesInProgressFlag *bool `json:"vdrUpdatesInProgressFlag,omitempty" xmlrpc:"vdrUpdatesInProgressFlag,omitempty"`

// A count of the bandwidth pooling for this account.
VirtualDedicatedRackCount *uint `json:"virtualDedicatedRackCount,omitempty" xmlrpc:"virtualDedicatedRackCount,omitempty"`

Expand Down Expand Up @@ -2097,7 +2072,7 @@ type Account_Link_OpenStack_DomainCreationDetails struct {
UserName *string `json:"userName,omitempty" xmlrpc:"userName,omitempty"`
}

// Details required for OpenStack link request
// Details Deprecated.
type Account_Link_OpenStack_LinkRequest struct {
Entity

Expand Down
18 changes: 17 additions & 1 deletion datatypes/billing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,9 @@ type Billing_Invoice_Item struct {
// The item description for this invoice item.
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`

// The invoice item ID from which the discount is derived.
DiscountingInvoiceItemId *int `json:"discountingInvoiceItemId,omitempty" xmlrpc:"discountingInvoiceItemId,omitempty"`

// The domain name of the invoiced item. This is only used on invoice items whose category is "server".
DomainName *string `json:"domainName,omitempty" xmlrpc:"domainName,omitempty"`

Expand Down Expand Up @@ -1968,7 +1971,8 @@ type Billing_Order struct {
// no documentation yet
PresaleEventId *int `json:"presaleEventId,omitempty" xmlrpc:"presaleEventId,omitempty"`

// Flag indicating a private cloud solution order (Deprecated)
// Deprecated.
// Deprecated: This function has been marked as deprecated.
PrivateCloudOrderFlag *bool `json:"privateCloudOrderFlag,omitempty" xmlrpc:"privateCloudOrderFlag,omitempty"`

// The quote of an order. This quote holds information about its expiration date, creation date, name and status. This information is tied to an order having the status 'QUOTE'
Expand Down Expand Up @@ -2306,6 +2310,12 @@ type Billing_Payment_Card_ChangeRequest struct {
// The State for the account.
BillingState *string `json:"billingState,omitempty" xmlrpc:"billingState,omitempty"`

// Total height of browser screen in pixels.
BrowserScreenHeight *string `json:"browserScreenHeight,omitempty" xmlrpc:"browserScreenHeight,omitempty"`

// Total width of browser screen in pixels.
BrowserScreenWidth *string `json:"browserScreenWidth,omitempty" xmlrpc:"browserScreenWidth,omitempty"`

// The SoftLayer_Billing_Payment_Card_Transaction tied to the capture of funds performed as part of this change request.
CaptureCreditCardTransaction *Billing_Payment_Card_Transaction `json:"captureCreditCardTransaction,omitempty" xmlrpc:"captureCreditCardTransaction,omitempty"`

Expand Down Expand Up @@ -2432,6 +2442,12 @@ type Billing_Payment_Card_ManualPayment struct {
// The State for the account.
BillingState *string `json:"billingState,omitempty" xmlrpc:"billingState,omitempty"`

// Total height of browser screen in pixels.
BrowserScreenHeight *string `json:"browserScreenHeight,omitempty" xmlrpc:"browserScreenHeight,omitempty"`

// Total width of browser screen in pixels.
BrowserScreenWidth *string `json:"browserScreenWidth,omitempty" xmlrpc:"browserScreenWidth,omitempty"`

// The cancel URL is the page to which PayPal redirects if payment is not approved.
CancelUrl *string `json:"cancelUrl,omitempty" xmlrpc:"cancelUrl,omitempty"`

Expand Down
21 changes: 16 additions & 5 deletions datatypes/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3340,7 +3340,8 @@ type Container_Product_Item_Discount_Program struct {
type Container_Product_Order struct {
Entity

// Flag for identifying an order for Big Data Deployment.
// Deprecated.
// Deprecated: This function has been marked as deprecated.
BigDataOrderFlag *bool `json:"bigDataOrderFlag,omitempty" xmlrpc:"bigDataOrderFlag,omitempty"`

// Billing Information associated with an order. For existing customers this information is completely ignored. Do not send this information for existing customers.
Expand Down Expand Up @@ -3460,10 +3461,12 @@ type Container_Product_Order struct {
// Priorities to set on replication set servers.
Priorities []string `json:"priorities,omitempty" xmlrpc:"priorities,omitempty"`

// Flag for identifying a container as Virtual Server (Private Node).
// Deprecated.
// Deprecated: This function has been marked as deprecated.
PrivateCloudOrderFlag *bool `json:"privateCloudOrderFlag,omitempty" xmlrpc:"privateCloudOrderFlag,omitempty"`

// Type of Virtual Server (Private Node) order. Potential values: INITIAL, ADDHOST, ADDIPS, ADDZONE
// Deprecated.
// Deprecated: This function has been marked as deprecated.
PrivateCloudOrderType *string `json:"privateCloudOrderType,omitempty" xmlrpc:"privateCloudOrderType,omitempty"`

// Optional promotion code for an order.
Expand Down Expand Up @@ -3494,10 +3497,12 @@ type Container_Product_Order struct {
// If a regional group is provided and VLANs are specified (within the <code>hardware</code> or <code>virtualGuests</code> properties), we will use the datacenter where the VLANs are located. If no VLANs are specified, we will use the preferred datacenter on the regional group object.
RegionalGroup *string `json:"regionalGroup,omitempty" xmlrpc:"regionalGroup,omitempty"`

// An optional resource group identifier specifying the resource group to attach the order to
// Deprecated.
// Deprecated: This function has been marked as deprecated.
ResourceGroupId *int `json:"resourceGroupId,omitempty" xmlrpc:"resourceGroupId,omitempty"`

// This variable specifies the name of the resource group the server configuration belongs to. For MongoDB Replica sets, it would be the replica set name.
// Deprecated.
// Deprecated: This function has been marked as deprecated.
ResourceGroupName *string `json:"resourceGroupName,omitempty" xmlrpc:"resourceGroupName,omitempty"`

// An optional resource group template identifier to be used as a deployment base for a Virtual Server (Private Node) order.
Expand Down Expand Up @@ -3678,6 +3683,12 @@ type Container_Product_Order_Billing_Information struct {
// The State for the account.
BillingState *string `json:"billingState,omitempty" xmlrpc:"billingState,omitempty"`

// Total height of browser screen in pixels.
BrowserScreenHeight *string `json:"browserScreenHeight,omitempty" xmlrpc:"browserScreenHeight,omitempty"`

// Total width of browser screen in pixels.
BrowserScreenWidth *string `json:"browserScreenWidth,omitempty" xmlrpc:"browserScreenWidth,omitempty"`

// The credit card number to use.
CardAccountNumber *string `json:"cardAccountNumber,omitempty" xmlrpc:"cardAccountNumber,omitempty"`

Expand Down
9 changes: 6 additions & 3 deletions datatypes/hardware.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,9 @@ type Hardware struct {
// Whether or not this hardware object is eligible to change to term billing.
IsBillingTermChangeAvailableFlag *bool `json:"isBillingTermChangeAvailableFlag,omitempty" xmlrpc:"isBillingTermChangeAvailableFlag,omitempty"`

// Determine if hardware object has the IBM_CLOUD_READY_NODE_CERTIFIED attribute.
IsCloudReadyNodeCertified *bool `json:"isCloudReadyNodeCertified,omitempty" xmlrpc:"isCloudReadyNodeCertified,omitempty"`

// Information regarding the last transaction a server performed.
LastTransaction *Provisioning_Version1_Transaction `json:"lastTransaction,omitempty" xmlrpc:"lastTransaction,omitempty"`

Expand Down Expand Up @@ -1965,12 +1968,12 @@ type Hardware_Server struct {
// The total private inbound bandwidth for this hardware for the current billing cycle.
InboundPrivateBandwidthUsage *Float64 `json:"inboundPrivateBandwidthUsage,omitempty" xmlrpc:"inboundPrivateBandwidthUsage,omitempty"`

// Determine if hardware object has the IBM_CLOUD_READY_NODE_CERTIFIED attribute.
IsCloudReadyNodeCertified *bool `json:"isCloudReadyNodeCertified,omitempty" xmlrpc:"isCloudReadyNodeCertified,omitempty"`

// Determine if remote management has been disabled due to port speed.
IsIpmiDisabled *bool `json:"isIpmiDisabled,omitempty" xmlrpc:"isIpmiDisabled,omitempty"`

// A server that has nfs only drive.
IsNfsOnly *string `json:"isNfsOnly,omitempty" xmlrpc:"isNfsOnly,omitempty"`

// Determine if hardware object has the QE_INTERNAL_SERVER attribute.
IsQeInternalServer *bool `json:"isQeInternalServer,omitempty" xmlrpc:"isQeInternalServer,omitempty"`

Expand Down
Loading

0 comments on commit 91ee005

Please sign in to comment.