Skip to content

Commit b28d7d4

Browse files
Merge pull request #182 from softlayer/issues172
Updates for 20240123
2 parents c48d644 + a8d6bef commit b28d7d4

32 files changed

Lines changed: 1415 additions & 1723 deletions

README.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,18 +342,47 @@ go get github.com/softlayer/softlayer-go/...
342342
make
343343
```
344344

345+
```bash
346+
gofmt -w `find . -name '*.go' | grep -v vendor`
347+
go vet -all $(go list ./... | grep -v datatypes)
348+
go get -d -v ./...
349+
go build ./...
350+
351+
```
352+
345353
### Test
346354

347355
```
348356
make test
349357
```
350358

359+
```bash
360+
gofmt -w `find . -name '*.go' | grep -v vendor`
361+
go vet -all $(go list ./... | grep -v datatypes)
362+
go get -d -v -t ./...
363+
go test $(go list ./... | grep -v '/vendor/') -timeout=30s -parallel=4 -coverprofile coverage.out
364+
```
365+
351366
### Updating dependencies
352367

353368
```
354369
make update_deps
355370
```
356371

372+
### Generate
373+
This downloads the API definitions and creates go files for them.
374+
375+
(with make)
376+
```bash
377+
make generate
378+
```
379+
380+
(manually)
381+
```bash
382+
go run tools/main.go tools/loadmeta.go tools/common.go tools/version.go generate
383+
```
384+
385+
357386
## Copyright
358387

359388
This software is Copyright (c) 2016 IBM Corp. See the bundled LICENSE file for more information.

datatypes/account.go

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

267+
// no documentation yet
268+
BluemixAccountId *string `json:"bluemixAccountId,omitempty" xmlrpc:"bluemixAccountId,omitempty"`
269+
267270
// The Platform account link associated with this SoftLayer account, if one exists.
268271
BluemixAccountLink *Account_Link_Bluemix `json:"bluemixAccountLink,omitempty" xmlrpc:"bluemixAccountLink,omitempty"`
269272

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

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

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

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

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

674679
// The total capacity of Legacy iSCSI Volumes on an account, in GB.
@@ -704,6 +709,10 @@ type Account struct {
704709
// An account's media transfer service requests.
705710
MediaDataTransferRequests []Account_Media_Data_Transfer_Request `json:"mediaDataTransferRequests,omitempty" xmlrpc:"mediaDataTransferRequests,omitempty"`
706711

712+
// [DEPRECATED] - An accounts metric tracking object. This object records all periodic polled data available to this account.
713+
// Deprecated: This function has been marked as deprecated.
714+
MetricTrackingObject *Metric_Tracking_Object `json:"metricTrackingObject,omitempty" xmlrpc:"metricTrackingObject,omitempty"`
715+
707716
// Flag indicating whether this account is restricted to the IBM Cloud portal.
708717
MigratedToIbmCloudPortalFlag *bool `json:"migratedToIbmCloudPortalFlag,omitempty" xmlrpc:"migratedToIbmCloudPortalFlag,omitempty"`
709718

@@ -1185,13 +1194,6 @@ type Account struct {
11851194
// The SAML configuration for this account.
11861195
SamlAuthentication *Account_Authentication_Saml `json:"samlAuthentication,omitempty" xmlrpc:"samlAuthentication,omitempty"`
11871196

1188-
// A count of [DEPRECATED] All scale groups on this account.
1189-
ScaleGroupCount *uint `json:"scaleGroupCount,omitempty" xmlrpc:"scaleGroupCount,omitempty"`
1190-
1191-
// [DEPRECATED] All scale groups on this account.
1192-
// Deprecated: This function has been marked as deprecated.
1193-
ScaleGroups []Scale_Group `json:"scaleGroups,omitempty" xmlrpc:"scaleGroups,omitempty"`
1194-
11951197
// A count of the secondary DNS records for a SoftLayer customer account.
11961198
SecondaryDomainCount *uint `json:"secondaryDomainCount,omitempty" xmlrpc:"secondaryDomainCount,omitempty"`
11971199

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

1321-
// A count of an account's associated Transcode account.
1322-
TranscodeAccountCount *uint `json:"transcodeAccountCount,omitempty" xmlrpc:"transcodeAccountCount,omitempty"`
1323-
1324-
// An account's associated Transcode account.
1325-
TranscodeAccounts []Network_Media_Transcode_Account `json:"transcodeAccounts,omitempty" xmlrpc:"transcodeAccounts,omitempty"`
1326-
13271323
// A count of an account's associated upgrade requests.
13281324
UpgradeRequestCount *uint `json:"upgradeRequestCount,omitempty" xmlrpc:"upgradeRequestCount,omitempty"`
13291325

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

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

13481344
// A count of the bandwidth pooling for this account.
@@ -1839,6 +1835,50 @@ type Account_Authentication_Saml struct {
18391835
SingleSignOnUrl *string `json:"singleSignOnUrl,omitempty" xmlrpc:"singleSignOnUrl,omitempty"`
18401836
}
18411837

1838+
// Represents a request to migrate an account to the owned brand.
1839+
type Account_Brand_Migration_Request struct {
1840+
Entity
1841+
1842+
// no documentation yet
1843+
Account *Account `json:"account,omitempty" xmlrpc:"account,omitempty"`
1844+
1845+
// ID of the [[SoftLayer_Account]].
1846+
AccountId *int `json:"accountId,omitempty" xmlrpc:"accountId,omitempty"`
1847+
1848+
// Timestamp of when the request was created.
1849+
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`
1850+
1851+
// no documentation yet
1852+
DestinationBrand *Brand `json:"destinationBrand,omitempty" xmlrpc:"destinationBrand,omitempty"`
1853+
1854+
// ID of the target [[SoftLayer_Brand]].
1855+
DestinationBrandId *int `json:"destinationBrandId,omitempty" xmlrpc:"destinationBrandId,omitempty"`
1856+
1857+
// ID of the request.
1858+
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
1859+
1860+
// Timestamp of when the migration will happen, or happened in the past.
1861+
MigrationDate *Time `json:"migrationDate,omitempty" xmlrpc:"migrationDate,omitempty"`
1862+
1863+
// Timestamp of when the request was last modified.
1864+
ModifyDate *Time `json:"modifyDate,omitempty" xmlrpc:"modifyDate,omitempty"`
1865+
1866+
// no documentation yet
1867+
SourceBrand *Brand `json:"sourceBrand,omitempty" xmlrpc:"sourceBrand,omitempty"`
1868+
1869+
// ID of the source [[SoftLayer_Brand]].
1870+
SourceBrandId *int `json:"sourceBrandId,omitempty" xmlrpc:"sourceBrandId,omitempty"`
1871+
1872+
// Status of the request.
1873+
Status *string `json:"status,omitempty" xmlrpc:"status,omitempty"`
1874+
1875+
// If present, a message giving more details of the current status.
1876+
StatusMessage *string `json:"statusMessage,omitempty" xmlrpc:"statusMessage,omitempty"`
1877+
1878+
// no documentation yet
1879+
User *User_Customer `json:"user,omitempty" xmlrpc:"user,omitempty"`
1880+
}
1881+
18421882
// Contains business partner details associated with an account. Country Enterprise Identifier (CEID), Channel ID, Segment ID and Reseller Level.
18431883
type Account_Business_Partner struct {
18441884
Entity
@@ -2009,6 +2049,11 @@ type Account_Internal_Ibm struct {
20092049
Entity
20102050
}
20112051

2052+
// no documentation yet
2053+
type Account_Internal_Ibm_CostRecovery_Validator struct {
2054+
Entity
2055+
}
2056+
20122057
// no documentation yet
20132058
type Account_Link struct {
20142059
Entity
@@ -2457,17 +2502,6 @@ type Account_Password_Type struct {
24572502
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`
24582503
}
24592504

2460-
// no documentation yet
2461-
type Account_PersonalData_RemoveRequestReview struct {
2462-
Entity
2463-
2464-
// no documentation yet
2465-
Account *Account `json:"account,omitempty" xmlrpc:"account,omitempty"`
2466-
2467-
// no documentation yet
2468-
ApprovedFlag *Account_PersonalData_RemoveRequestReview `json:"approvedFlag,omitempty" xmlrpc:"approvedFlag,omitempty"`
2469-
}
2470-
24712505
// no documentation yet
24722506
type Account_ProofOfConcept struct {
24732507
Entity

datatypes/auxiliary.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,6 @@
2020

2121
package datatypes
2222

23-
// no documentation yet
24-
type Auxiliary_Marketing_Event struct {
25-
Entity
26-
27-
// no documentation yet
28-
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`
29-
30-
// no documentation yet
31-
EnabledFlag *int `json:"enabledFlag,omitempty" xmlrpc:"enabledFlag,omitempty"`
32-
33-
// no documentation yet
34-
EndDate *Time `json:"endDate,omitempty" xmlrpc:"endDate,omitempty"`
35-
36-
// no documentation yet
37-
Location *string `json:"location,omitempty" xmlrpc:"location,omitempty"`
38-
39-
// no documentation yet
40-
ModifyDate *Time `json:"modifyDate,omitempty" xmlrpc:"modifyDate,omitempty"`
41-
42-
// no documentation yet
43-
StartDate *Time `json:"startDate,omitempty" xmlrpc:"startDate,omitempty"`
44-
45-
// no documentation yet
46-
Title *string `json:"title,omitempty" xmlrpc:"title,omitempty"`
47-
48-
// no documentation yet
49-
Url *string `json:"url,omitempty" xmlrpc:"url,omitempty"`
50-
}
51-
5223
// no documentation yet
5324
type Auxiliary_Network_Status struct {
5425
Entity

datatypes/billing.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,9 @@ type Billing_Invoice_Item struct {
446446
// The date the invoice item was created.
447447
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`
448448

449+
// This is the DPart for invoice item.
450+
DPart *string `json:"dPart,omitempty" xmlrpc:"dPart,omitempty"`
451+
449452
// The item description for this invoice item.
450453
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`
451454

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

521+
// This is the package id for this invoice item.
522+
PackageId *int `json:"packageId,omitempty" xmlrpc:"packageId,omitempty"`
523+
518524
// 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.
519525
Parent *Billing_Invoice_Item `json:"parent,omitempty" xmlrpc:"parent,omitempty"`
520526

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

1034+
// This is the package id for this billing item.
1035+
PackageId *int `json:"packageId,omitempty" xmlrpc:"packageId,omitempty"`
1036+
10281037
// A billing item's parent item. If a billing item has no parent item then this value is null.
10291038
Parent *Billing_Item `json:"parent,omitempty" xmlrpc:"parent,omitempty"`
10301039

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

1289+
// no documentation yet
1290+
DPart *string `json:"dPart,omitempty" xmlrpc:"dPart,omitempty"`
1291+
12801292
// no documentation yet
12811293
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`
12821294

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

1337+
// no documentation yet
1338+
PackageId *int `json:"packageId,omitempty" xmlrpc:"packageId,omitempty"`
1339+
13251340
// no documentation yet
13261341
ParentId *int `json:"parentId,omitempty" xmlrpc:"parentId,omitempty"`
13271342

datatypes/bms.go

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/**
2+
* Copyright 2016 IBM Corp.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* AUTOMATICALLY GENERATED CODE - DO NOT MODIFY
19+
*/
20+
21+
package datatypes
22+
23+
// no documentation yet
24+
type BMS_Container_Country struct {
25+
Entity
26+
27+
// no documentation yet
28+
Code *string `json:"code,omitempty" xmlrpc:"code,omitempty"`
29+
30+
// no documentation yet
31+
Id *string `json:"id,omitempty" xmlrpc:"id,omitempty"`
32+
}

0 commit comments

Comments
 (0)