Skip to content

Commit 2ecaf6f

Browse files
Merge pull request #193 from softlayer/20240606
20240606 updates
2 parents 386f1c8 + 3319f58 commit 2ecaf6f

File tree

14 files changed

+183
-392
lines changed

14 files changed

+183
-392
lines changed

.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-05-23T19:37:19Z",
6+
"generated_at": "2024-06-06T22:18:14Z",
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": 1877,
129+
"line_number": 1740,
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": 1884,
137+
"line_number": 1747,
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": 1891,
145+
"line_number": 1754,
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": 1898,
153+
"line_number": 1761,
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": 1905,
161+
"line_number": 1768,
162162
"type": "Secret Keyword",
163163
"verified_result": null
164164
}

datatypes/hardware.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,6 +1190,12 @@ type Hardware_Component_Model struct {
11901190

11911191
// The model number or model description of a hardware component model.
11921192
Version *string `json:"version,omitempty" xmlrpc:"version,omitempty"`
1193+
1194+
// A count of
1195+
VmwareQualifiedFirmwareCount *uint `json:"vmwareQualifiedFirmwareCount,omitempty" xmlrpc:"vmwareQualifiedFirmwareCount,omitempty"`
1196+
1197+
// no documentation yet
1198+
VmwareQualifiedFirmwares []Hardware_Component_Firmware `json:"vmwareQualifiedFirmwares,omitempty" xmlrpc:"vmwareQualifiedFirmwares,omitempty"`
11931199
}
11941200

11951201
// no documentation yet

datatypes/location.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
package datatypes
1515

16-
// Every piece of hardware and network connection owned by SoftLayer is tracked physically by location and stored in the SoftLayer_Location data type. SoftLayer locations exist in parent/child relationships, a convenient way to track equipment from it's city, datacenter, server room, rack, then slot. Network backbones are tied to datacenters only, not to a room, rack, or slot.
16+
// Every piece of hardware and network connection owned by SoftLayer is tracked physically by location and stored in the SoftLayer_Location data type. SoftLayer locations exist in parent/child relationships, a convenient way to track equipment from it's city, datacenter, server room, rack, then slot.
1717
type Location struct {
1818
Entity
1919

@@ -23,13 +23,6 @@ type Location struct {
2323
// no documentation yet
2424
ActivePresaleEvents []Sales_Presale_Event `json:"activePresaleEvents,omitempty" xmlrpc:"activePresaleEvents,omitempty"`
2525

26-
// A count of
27-
BackboneDependentCount *uint `json:"backboneDependentCount,omitempty" xmlrpc:"backboneDependentCount,omitempty"`
28-
29-
// no documentation yet
30-
// Deprecated: This function has been marked as deprecated.
31-
BackboneDependents []Network_Backbone_Location_Dependent `json:"backboneDependents,omitempty" xmlrpc:"backboneDependents,omitempty"`
32-
3326
// A flag indicating whether or not the datacenter/location is BNPP compliant.
3427
BnppCompliantFlag *bool `json:"bnppCompliantFlag,omitempty" xmlrpc:"bnppCompliantFlag,omitempty"`
3528

datatypes/network.go

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -557,63 +557,6 @@ type Network_Application_Delivery_Controller_Type struct {
557557
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
558558
}
559559

560-
// A SoftLayer_Network_Backbone represents a single backbone connection from SoftLayer to the public Internet, from the Internet to the SoftLayer private network, or a link that connects the private networks between SoftLayer's datacenters. The SoftLayer_Network_Backbone data type is a collection of data associated with one of those connections.
561-
type Network_Backbone struct {
562-
Entity
563-
564-
// The numeric portion of the bandwidth capacity of a SoftLayer backbone. For instance, if a backbone is rated at "1 GigE" capacity then the capacity property of the backbone is 1.
565-
Capacity *int `json:"capacity,omitempty" xmlrpc:"capacity,omitempty"`
566-
567-
// 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".
568-
CapacityUnits *string `json:"capacityUnits,omitempty" xmlrpc:"capacityUnits,omitempty"`
569-
570-
// [Deprecated] A backbone's status.
571-
// Deprecated: This function has been marked as deprecated.
572-
Health *string `json:"health,omitempty" xmlrpc:"health,omitempty"`
573-
574-
// A backbone's internal identifier.
575-
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
576-
577-
// [Deprecated] Which of the SoftLayer datacenters a backbone is connected to.
578-
// Deprecated: This function has been marked as deprecated.
579-
Location *Location `json:"location,omitempty" xmlrpc:"location,omitempty"`
580-
581-
// 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.
582-
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
583-
584-
// [Deprecated] A backbone's primary network component.
585-
// Deprecated: This function has been marked as deprecated.
586-
NetworkComponent *Network_Component `json:"networkComponent,omitempty" xmlrpc:"networkComponent,omitempty"`
587-
588-
// The internal identifier of the network component that backbone is connected to.
589-
NetworkComponentId *int `json:"networkComponentId,omitempty" xmlrpc:"networkComponentId,omitempty"`
590-
591-
// Whether a SoftLayer backbone connects to the public Internet, to the private network, or connecting the private networks of SoftLayer's datacenters. Type is either the string "public", "private", or "private-interconnect".
592-
Type *string `json:"type,omitempty" xmlrpc:"type,omitempty"`
593-
}
594-
595-
// no documentation yet
596-
type Network_Backbone_Location_Dependent struct {
597-
Entity
598-
599-
// no documentation yet
600-
// Deprecated: This function has been marked as deprecated.
601-
DependentLocation *Location `json:"dependentLocation,omitempty" xmlrpc:"dependentLocation,omitempty"`
602-
603-
// no documentation yet
604-
DependentLocationId *int `json:"dependentLocationId,omitempty" xmlrpc:"dependentLocationId,omitempty"`
605-
606-
// no documentation yet
607-
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
608-
609-
// no documentation yet
610-
// Deprecated: This function has been marked as deprecated.
611-
SourceLocation *Location `json:"sourceLocation,omitempty" xmlrpc:"sourceLocation,omitempty"`
612-
613-
// no documentation yet
614-
SourceLocationId *int `json:"sourceLocationId,omitempty" xmlrpc:"sourceLocationId,omitempty"`
615-
}
616-
617560
// The SoftLayer_Network_Bandwidth_Usage data type contains specific information relating to bandwidth utilization at a specific point in time on a given network interface.
618561
type Network_Bandwidth_Usage struct {
619562
Entity
@@ -3456,6 +3399,7 @@ type Network_Service_Health struct {
34563399
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`
34573400

34583401
// A service's location.
3402+
// Deprecated: This function has been marked as deprecated.
34593403
Location *Location `json:"location,omitempty" xmlrpc:"location,omitempty"`
34603404

34613405
// A service's location identifier.
@@ -3465,6 +3409,7 @@ type Network_Service_Health struct {
34653409
ModifyDate *Time `json:"modifyDate,omitempty" xmlrpc:"modifyDate,omitempty"`
34663410

34673411
// The status portion of a service/status relationship.
3412+
// Deprecated: This function has been marked as deprecated.
34683413
Status *Network_Service_Health_Status `json:"status,omitempty" xmlrpc:"status,omitempty"`
34693414

34703415
// A service's status identifier.

datatypes/user.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,12 @@ type User_Permission_Action struct {
11351135
// no documentation yet
11361136
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`
11371137

1138+
// no documentation yet
1139+
Department *User_Permission_Department `json:"department,omitempty" xmlrpc:"department,omitempty"`
1140+
1141+
// no documentation yet
1142+
DepartmentId *int `json:"departmentId,omitempty" xmlrpc:"departmentId,omitempty"`
1143+
11381144
// no documentation yet
11391145
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`
11401146

@@ -1155,6 +1161,29 @@ type User_Permission_Action struct {
11551161
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
11561162
}
11571163

1164+
// no documentation yet
1165+
type User_Permission_Department struct {
1166+
Entity
1167+
1168+
// Department description
1169+
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`
1170+
1171+
// Department primary identifier
1172+
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`
1173+
1174+
// Department key name
1175+
KeyName *string `json:"keyName,omitempty" xmlrpc:"keyName,omitempty"`
1176+
1177+
// Department readable name
1178+
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
1179+
1180+
// A count of
1181+
PermissionCount *uint `json:"permissionCount,omitempty" xmlrpc:"permissionCount,omitempty"`
1182+
1183+
// no documentation yet
1184+
Permissions []User_Permission_Action `json:"permissions,omitempty" xmlrpc:"permissions,omitempty"`
1185+
}
1186+
11581187
// The SoftLayer_User_Permission_Group data type contains local attributes to identify and describe the permission groups that have been created within IMS. These includes a name, description, and account id. Permission groups are defined specifically for a single [[SoftLayer_Account]].
11591188
//
11601189
// It also contains relational attributes that indicate what SoftLayer_User_Permission_Action objects belong to a particular group, and what SoftLayer_User_Permission_Role objects the group is linked.

services/account.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3504,7 +3504,7 @@ func (r Account_Lockdown_Request) CancelRequest() (err error) {
35043504
return
35053505
}
35063506

3507-
// 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.
3507+
// Takes the original lockdown request ID. The account will be disabled immediately. All hardware will be reclaimed and all accounts permanently disabled.
35083508
func (r Account_Lockdown_Request) DisableLockedAccount(disableDate *string, statusChangeReasonKeyName *string) (resp int, err error) {
35093509
params := []interface{}{
35103510
disableDate,
@@ -3514,7 +3514,7 @@ func (r Account_Lockdown_Request) DisableLockedAccount(disableDate *string, stat
35143514
return
35153515
}
35163516

3517-
// Takes an account ID and an optional disconnect date. If no disconnect date is passed into the API call, the account disconnection will happen immediately. Otherwise, the account disconnection will happen on the date given. A brand account request ID will be returned and will then be updated when the disconnection occurs.
3517+
// Takes an account ID. Note the disconnection will happen immediately. A brand account request ID will be returned and will then be updated when the disconnection occurs.
35183518
func (r Account_Lockdown_Request) DisconnectCompute(accountId *int, disconnectDate *string) (resp int, err error) {
35193519
params := []interface{}{
35203520
accountId,
@@ -3539,7 +3539,7 @@ func (r Account_Lockdown_Request) GetObject() (resp datatypes.Account_Lockdown_R
35393539
return
35403540
}
35413541

3542-
// Takes the original disconnected lockdown event ID, and an optional reconnect date. If no reconnect date is passed with the API call, the account reconnection will happen immediately. Otherwise, the account reconnection will happen on the date given. The associated lockdown event will be unlocked and closed at that time.
3542+
// Takes the original disconnected lockdown request ID. The account reconnection will happen immediately. The associated lockdown event will be unlocked and closed at that time.
35433543
func (r Account_Lockdown_Request) ReconnectCompute(reconnectDate *string) (resp int, err error) {
35443544
params := []interface{}{
35453545
reconnectDate,

services/hardware.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,6 +1879,12 @@ func (r Hardware_Component_Model) GetValidAttributeTypes() (resp []datatypes.Har
18791879
return
18801880
}
18811881

1882+
// Retrieve
1883+
func (r Hardware_Component_Model) GetVmwareQualifiedFirmwares() (resp []datatypes.Hardware_Component_Firmware, err error) {
1884+
err = r.Session.DoRequest("SoftLayer_Hardware_Component_Model", "getVmwareQualifiedFirmwares", nil, &r.Options, &resp)
1885+
return
1886+
}
1887+
18821888
// The SoftLayer_Hardware_Component_Partition_OperatingSystem data type contains general information relating to a single SoftLayer Operating System Partition Template.
18831889
type Hardware_Component_Partition_OperatingSystem struct {
18841890
Session session.SLSession

services/hardware_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1646,6 +1646,13 @@ var _ = Describe("Hardware Tests", func() {
16461646
Expect(slsession.DoRequestCallCount()).To(Equal(1))
16471647
})
16481648
})
1649+
Context("SoftLayer_Hardware_Component_Model::getVmwareQualifiedFirmwares", func() {
1650+
It("API Call Test", func() {
1651+
_, err := sl_service.GetVmwareQualifiedFirmwares()
1652+
Expect(err).To(Succeed())
1653+
Expect(slsession.DoRequestCallCount()).To(Equal(1))
1654+
})
1655+
})
16491656
})
16501657

16511658
Context("Testing SoftLayer_Hardware_Component_Partition_OperatingSystem service", func() {

services/location.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/softlayer/softlayer-go/sl"
2323
)
2424

25-
// Every piece of hardware and network connection owned by SoftLayer is tracked physically by location and stored in the SoftLayer_Location data type. SoftLayer locations exist in parent/child relationships, a convenient way to track equipment from it's city, datacenter, server room, rack, then slot. Network backbones are tied to datacenters only, not to a room, rack, or slot.
25+
// Every piece of hardware and network connection owned by SoftLayer is tracked physically by location and stored in the SoftLayer_Location data type. SoftLayer locations exist in parent/child relationships, a convenient way to track equipment from it's city, datacenter, server room, rack, then slot.
2626
type Location struct {
2727
Session session.SLSession
2828
Options sl.Options
@@ -74,12 +74,6 @@ func (r Location) GetAvailableObjectStorageDatacenters() (resp []datatypes.Locat
7474
return
7575
}
7676

77-
// Retrieve
78-
func (r Location) GetBackboneDependents() (resp []datatypes.Network_Backbone_Location_Dependent, err error) {
79-
err = r.Session.DoRequest("SoftLayer_Location", "getBackboneDependents", nil, &r.Options, &resp)
80-
return
81-
}
82-
8377
// Retrieve A flag indicating whether or not the datacenter/location is BNPP compliant.
8478
func (r Location) GetBnppCompliantFlag() (resp bool, err error) {
8579
err = r.Session.DoRequest("SoftLayer_Location", "getBnppCompliantFlag", nil, &r.Options, &resp)
@@ -270,12 +264,6 @@ func (r Location_Datacenter) GetAvailableObjectStorageDatacenters() (resp []data
270264
return
271265
}
272266

273-
// Retrieve
274-
func (r Location_Datacenter) GetBackboneDependents() (resp []datatypes.Network_Backbone_Location_Dependent, err error) {
275-
err = r.Session.DoRequest("SoftLayer_Location_Datacenter", "getBackboneDependents", nil, &r.Options, &resp)
276-
return
277-
}
278-
279267
// Retrieve
280268
func (r Location_Datacenter) GetBackendHardwareRouters() (resp []datatypes.Hardware, err error) {
281269
err = r.Session.DoRequest("SoftLayer_Location_Datacenter", "getBackendHardwareRouters", nil, &r.Options, &resp)

services/location_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@ var _ = Describe("Location Tests", func() {
5656
Expect(slsession.DoRequestCallCount()).To(Equal(1))
5757
})
5858
})
59-
Context("SoftLayer_Location::getBackboneDependents", func() {
60-
It("API Call Test", func() {
61-
_, err := sl_service.GetBackboneDependents()
62-
Expect(err).To(Succeed())
63-
Expect(slsession.DoRequestCallCount()).To(Equal(1))
64-
})
65-
})
6659
Context("SoftLayer_Location::getBnppCompliantFlag", func() {
6760
It("API Call Test", func() {
6861
_, err := sl_service.GetBnppCompliantFlag()
@@ -268,13 +261,6 @@ var _ = Describe("Location Tests", func() {
268261
Expect(slsession.DoRequestCallCount()).To(Equal(1))
269262
})
270263
})
271-
Context("SoftLayer_Location_Datacenter::getBackboneDependents", func() {
272-
It("API Call Test", func() {
273-
_, err := sl_service.GetBackboneDependents()
274-
Expect(err).To(Succeed())
275-
Expect(slsession.DoRequestCallCount()).To(Equal(1))
276-
})
277-
})
278264
Context("SoftLayer_Location_Datacenter::getBackendHardwareRouters", func() {
279265
It("API Call Test", func() {
280266
_, err := sl_service.GetBackendHardwareRouters()

0 commit comments

Comments
 (0)