Skip to content

Commit

Permalink
Merge pull request #182 from softlayer/issues172
Browse files Browse the repository at this point in the history
Updates for 20240123
  • Loading branch information
allmightyspiff committed Jan 25, 2024
2 parents c48d644 + a8d6bef commit b28d7d4
Show file tree
Hide file tree
Showing 32 changed files with 1,415 additions and 1,723 deletions.
29 changes: 29 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,18 +342,47 @@ go get github.com/softlayer/softlayer-go/...
make
```

```bash
gofmt -w `find . -name '*.go' | grep -v vendor`
go vet -all $(go list ./... | grep -v datatypes)
go get -d -v ./...
go build ./...

```

### Test

```
make test
```

```bash
gofmt -w `find . -name '*.go' | grep -v vendor`
go vet -all $(go list ./... | grep -v datatypes)
go get -d -v -t ./...
go test $(go list ./... | grep -v '/vendor/') -timeout=30s -parallel=4 -coverprofile coverage.out
```

### Updating dependencies

```
make update_deps
```

### Generate
This downloads the API definitions and creates go files for them.

(with make)
```bash
make generate
```

(manually)
```bash
go run tools/main.go tools/loadmeta.go tools/common.go tools/version.go generate
```


## Copyright

This software is Copyright (c) 2016 IBM Corp. See the bundled LICENSE file for more information.
88 changes: 61 additions & 27 deletions datatypes/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,9 @@ type Account struct {
// Private template group objects (parent and children) and the shared template group objects (parent only) for an account.
BlockDeviceTemplateGroups []Virtual_Guest_Block_Device_Template_Group `json:"blockDeviceTemplateGroups,omitempty" xmlrpc:"blockDeviceTemplateGroups,omitempty"`

// no documentation yet
BluemixAccountId *string `json:"bluemixAccountId,omitempty" xmlrpc:"bluemixAccountId,omitempty"`

// The Platform account link associated with this SoftLayer account, if one exists.
BluemixAccountLink *Account_Link_Bluemix `json:"bluemixAccountLink,omitempty" xmlrpc:"bluemixAccountLink,omitempty"`

Expand Down Expand Up @@ -353,6 +356,7 @@ type Account struct {
DomainRegistrationCount *uint `json:"domainRegistrationCount,omitempty" xmlrpc:"domainRegistrationCount,omitempty"`

// no documentation yet
// Deprecated: This function has been marked as deprecated.
DomainRegistrations []Dns_Domain_Registration `json:"domainRegistrations,omitempty" xmlrpc:"domainRegistrations,omitempty"`

// The DNS domains associated with an account.
Expand Down Expand Up @@ -665,10 +669,11 @@ type Account struct {
// An account's latest recurring pending invoice.
LatestRecurringPendingInvoice *Billing_Invoice `json:"latestRecurringPendingInvoice,omitempty" xmlrpc:"latestRecurringPendingInvoice,omitempty"`

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

// The legacy bandwidth allotments for an account.
// [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.
Expand Down Expand Up @@ -704,6 +709,10 @@ 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 @@ -1185,13 +1194,6 @@ type Account struct {
// The SAML configuration for this account.
SamlAuthentication *Account_Authentication_Saml `json:"samlAuthentication,omitempty" xmlrpc:"samlAuthentication,omitempty"`

// A count of [DEPRECATED] All scale groups on this account.
ScaleGroupCount *uint `json:"scaleGroupCount,omitempty" xmlrpc:"scaleGroupCount,omitempty"`

// [DEPRECATED] All scale groups on this account.
// Deprecated: This function has been marked as deprecated.
ScaleGroups []Scale_Group `json:"scaleGroups,omitempty" xmlrpc:"scaleGroups,omitempty"`

// A count of the secondary DNS records for a SoftLayer customer account.
SecondaryDomainCount *uint `json:"secondaryDomainCount,omitempty" xmlrpc:"secondaryDomainCount,omitempty"`

Expand Down Expand Up @@ -1318,12 +1320,6 @@ type Account struct {
// A count of tickets closed today associated with an account.
TicketsClosedTodayCount *uint `json:"ticketsClosedTodayCount,omitempty" xmlrpc:"ticketsClosedTodayCount,omitempty"`

// A count of an account's associated Transcode account.
TranscodeAccountCount *uint `json:"transcodeAccountCount,omitempty" xmlrpc:"transcodeAccountCount,omitempty"`

// An account's associated Transcode account.
TranscodeAccounts []Network_Media_Transcode_Account `json:"transcodeAccounts,omitempty" xmlrpc:"transcodeAccounts,omitempty"`

// A count of an account's associated upgrade requests.
UpgradeRequestCount *uint `json:"upgradeRequestCount,omitempty" xmlrpc:"upgradeRequestCount,omitempty"`

Expand All @@ -1342,7 +1338,7 @@ type Account struct {
// Stored security certificates that are not expired (ie. SSL)
ValidSecurityCertificates []Security_Certificate `json:"validSecurityCertificates,omitempty" xmlrpc:"validSecurityCertificates,omitempty"`

// Return 0 if vpn updates are currently in progress on this account otherwise 1.
// 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.
Expand Down Expand Up @@ -1839,6 +1835,50 @@ type Account_Authentication_Saml struct {
SingleSignOnUrl *string `json:"singleSignOnUrl,omitempty" xmlrpc:"singleSignOnUrl,omitempty"`
}

// Represents a request to migrate an account to the owned brand.
type Account_Brand_Migration_Request struct {
Entity

// no documentation yet
Account *Account `json:"account,omitempty" xmlrpc:"account,omitempty"`

// ID of the [[SoftLayer_Account]].
AccountId *int `json:"accountId,omitempty" xmlrpc:"accountId,omitempty"`

// Timestamp of when the request was created.
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`

// no documentation yet
DestinationBrand *Brand `json:"destinationBrand,omitempty" xmlrpc:"destinationBrand,omitempty"`

// ID of the target [[SoftLayer_Brand]].
DestinationBrandId *int `json:"destinationBrandId,omitempty" xmlrpc:"destinationBrandId,omitempty"`

// ID of the request.
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`

// Timestamp of when the migration will happen, or happened in the past.
MigrationDate *Time `json:"migrationDate,omitempty" xmlrpc:"migrationDate,omitempty"`

// Timestamp of when the request was last modified.
ModifyDate *Time `json:"modifyDate,omitempty" xmlrpc:"modifyDate,omitempty"`

// no documentation yet
SourceBrand *Brand `json:"sourceBrand,omitempty" xmlrpc:"sourceBrand,omitempty"`

// ID of the source [[SoftLayer_Brand]].
SourceBrandId *int `json:"sourceBrandId,omitempty" xmlrpc:"sourceBrandId,omitempty"`

// Status of the request.
Status *string `json:"status,omitempty" xmlrpc:"status,omitempty"`

// If present, a message giving more details of the current status.
StatusMessage *string `json:"statusMessage,omitempty" xmlrpc:"statusMessage,omitempty"`

// no documentation yet
User *User_Customer `json:"user,omitempty" xmlrpc:"user,omitempty"`
}

// Contains business partner details associated with an account. Country Enterprise Identifier (CEID), Channel ID, Segment ID and Reseller Level.
type Account_Business_Partner struct {
Entity
Expand Down Expand Up @@ -2009,6 +2049,11 @@ type Account_Internal_Ibm struct {
Entity
}

// no documentation yet
type Account_Internal_Ibm_CostRecovery_Validator struct {
Entity
}

// no documentation yet
type Account_Link struct {
Entity
Expand Down Expand Up @@ -2457,17 +2502,6 @@ type Account_Password_Type struct {
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`
}

// no documentation yet
type Account_PersonalData_RemoveRequestReview struct {
Entity

// no documentation yet
Account *Account `json:"account,omitempty" xmlrpc:"account,omitempty"`

// no documentation yet
ApprovedFlag *Account_PersonalData_RemoveRequestReview `json:"approvedFlag,omitempty" xmlrpc:"approvedFlag,omitempty"`
}

// no documentation yet
type Account_ProofOfConcept struct {
Entity
Expand Down
29 changes: 0 additions & 29 deletions datatypes/auxiliary.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,6 @@

package datatypes

// no documentation yet
type Auxiliary_Marketing_Event struct {
Entity

// no documentation yet
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`

// no documentation yet
EnabledFlag *int `json:"enabledFlag,omitempty" xmlrpc:"enabledFlag,omitempty"`

// no documentation yet
EndDate *Time `json:"endDate,omitempty" xmlrpc:"endDate,omitempty"`

// no documentation yet
Location *string `json:"location,omitempty" xmlrpc:"location,omitempty"`

// no documentation yet
ModifyDate *Time `json:"modifyDate,omitempty" xmlrpc:"modifyDate,omitempty"`

// no documentation yet
StartDate *Time `json:"startDate,omitempty" xmlrpc:"startDate,omitempty"`

// no documentation yet
Title *string `json:"title,omitempty" xmlrpc:"title,omitempty"`

// no documentation yet
Url *string `json:"url,omitempty" xmlrpc:"url,omitempty"`
}

// no documentation yet
type Auxiliary_Network_Status struct {
Entity
Expand Down
15 changes: 15 additions & 0 deletions datatypes/billing.go
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,9 @@ type Billing_Invoice_Item struct {
// The date the invoice item was created.
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`

// This is the DPart for invoice item.
DPart *string `json:"dPart,omitempty" xmlrpc:"dPart,omitempty"`

// The item description for this invoice item.
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`

Expand Down Expand Up @@ -515,6 +518,9 @@ type Billing_Invoice_Item struct {
// An invoice item's one-time tax amount. This does not include any child invoice items.
OneTimeTaxAmount *Float64 `json:"oneTimeTaxAmount,omitempty" xmlrpc:"oneTimeTaxAmount,omitempty"`

// This is the package id for this invoice item.
PackageId *int `json:"packageId,omitempty" xmlrpc:"packageId,omitempty"`

// Every item tied to a server should have a parent invoice item which is the server line item. This is how we associate items to a server.
Parent *Billing_Invoice_Item `json:"parent,omitempty" xmlrpc:"parent,omitempty"`

Expand Down Expand Up @@ -1025,6 +1031,9 @@ type Billing_Item struct {
// The package under which this billing item was sold. A Package is the general grouping of products as seen on our order forms.
Package *Product_Package `json:"package,omitempty" xmlrpc:"package,omitempty"`

// This is the package id for this billing item.
PackageId *int `json:"packageId,omitempty" xmlrpc:"packageId,omitempty"`

// A billing item's parent item. If a billing item has no parent item then this value is null.
Parent *Billing_Item `json:"parent,omitempty" xmlrpc:"parent,omitempty"`

Expand Down Expand Up @@ -1277,6 +1286,9 @@ type Billing_Item_Chronicle struct {
// no documentation yet
CycleStartDate *Time `json:"cycleStartDate,omitempty" xmlrpc:"cycleStartDate,omitempty"`

// no documentation yet
DPart *string `json:"dPart,omitempty" xmlrpc:"dPart,omitempty"`

// no documentation yet
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`

Expand Down Expand Up @@ -1322,6 +1334,9 @@ type Billing_Item_Chronicle struct {
// no documentation yet
OneTimeFee *Float64 `json:"oneTimeFee,omitempty" xmlrpc:"oneTimeFee,omitempty"`

// no documentation yet
PackageId *int `json:"packageId,omitempty" xmlrpc:"packageId,omitempty"`

// no documentation yet
ParentId *int `json:"parentId,omitempty" xmlrpc:"parentId,omitempty"`

Expand Down
32 changes: 32 additions & 0 deletions datatypes/bms.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* Copyright 2016 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* AUTOMATICALLY GENERATED CODE - DO NOT MODIFY
*/

package datatypes

// no documentation yet
type BMS_Container_Country struct {
Entity

// no documentation yet
Code *string `json:"code,omitempty" xmlrpc:"code,omitempty"`

// no documentation yet
Id *string `json:"id,omitempty" xmlrpc:"id,omitempty"`
}
Loading

0 comments on commit b28d7d4

Please sign in to comment.