Skip to content

Commit

Permalink
Merge pull request #193 from softlayer/20240606
Browse files Browse the repository at this point in the history
20240606 updates
  • Loading branch information
allmightyspiff authored Jun 6, 2024
2 parents 386f1c8 + 3319f58 commit 2ecaf6f
Show file tree
Hide file tree
Showing 14 changed files with 183 additions and 392 deletions.
12 changes: 6 additions & 6 deletions .secrets.baseline
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-05-23T19:37:19Z",
"generated_at": "2024-06-06T22:18:14Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -126,39 +126,39 @@
"hashed_secret": "319f96013e95ce7556aa082a9dd58dce40aeff0f",
"is_secret": false,
"is_verified": false,
"line_number": 1877,
"line_number": 1740,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "fa9250fd74ad6c9f6737049b5bd842709fbf4ae3",
"is_secret": false,
"is_verified": false,
"line_number": 1884,
"line_number": 1747,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "bf9130647c179bd2b6992bcf2db4560b91bc513d",
"is_secret": false,
"is_verified": false,
"line_number": 1891,
"line_number": 1754,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "0f39e6d6c8aafa1e3e723d1b06aef02ead75b908",
"is_secret": false,
"is_verified": false,
"line_number": 1898,
"line_number": 1761,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "5487abf5507e25b18b47a3e8cd1ecfdea8c0e9e9",
"is_secret": false,
"is_verified": false,
"line_number": 1905,
"line_number": 1768,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
6 changes: 6 additions & 0 deletions datatypes/hardware.go
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,12 @@ type Hardware_Component_Model struct {

// The model number or model description of a hardware component model.
Version *string `json:"version,omitempty" xmlrpc:"version,omitempty"`

// A count of
VmwareQualifiedFirmwareCount *uint `json:"vmwareQualifiedFirmwareCount,omitempty" xmlrpc:"vmwareQualifiedFirmwareCount,omitempty"`

// no documentation yet
VmwareQualifiedFirmwares []Hardware_Component_Firmware `json:"vmwareQualifiedFirmwares,omitempty" xmlrpc:"vmwareQualifiedFirmwares,omitempty"`
}

// no documentation yet
Expand Down
9 changes: 1 addition & 8 deletions datatypes/location.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

package datatypes

// 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.
// 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.
type Location struct {
Entity

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

// A count of
BackboneDependentCount *uint `json:"backboneDependentCount,omitempty" xmlrpc:"backboneDependentCount,omitempty"`

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

// A flag indicating whether or not the datacenter/location is BNPP compliant.
BnppCompliantFlag *bool `json:"bnppCompliantFlag,omitempty" xmlrpc:"bnppCompliantFlag,omitempty"`

Expand Down
59 changes: 2 additions & 57 deletions datatypes/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -557,63 +557,6 @@ type Network_Application_Delivery_Controller_Type struct {
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`
}

// 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.
type Network_Backbone struct {
Entity

// 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.
Capacity *int `json:"capacity,omitempty" xmlrpc:"capacity,omitempty"`

// 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".
CapacityUnits *string `json:"capacityUnits,omitempty" xmlrpc:"capacityUnits,omitempty"`

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

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

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

// 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.
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`

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

// The internal identifier of the network component that backbone is connected to.
NetworkComponentId *int `json:"networkComponentId,omitempty" xmlrpc:"networkComponentId,omitempty"`

// 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".
Type *string `json:"type,omitempty" xmlrpc:"type,omitempty"`
}

// no documentation yet
type Network_Backbone_Location_Dependent struct {
Entity

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

// no documentation yet
DependentLocationId *int `json:"dependentLocationId,omitempty" xmlrpc:"dependentLocationId,omitempty"`

// no documentation yet
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`

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

// no documentation yet
SourceLocationId *int `json:"sourceLocationId,omitempty" xmlrpc:"sourceLocationId,omitempty"`
}

// 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.
type Network_Bandwidth_Usage struct {
Entity
Expand Down Expand Up @@ -3456,6 +3399,7 @@ type Network_Service_Health struct {
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`

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

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

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

// A service's status identifier.
Expand Down
29 changes: 29 additions & 0 deletions datatypes/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -1135,6 +1135,12 @@ type User_Permission_Action struct {
// no documentation yet
CreateDate *Time `json:"createDate,omitempty" xmlrpc:"createDate,omitempty"`

// no documentation yet
Department *User_Permission_Department `json:"department,omitempty" xmlrpc:"department,omitempty"`

// no documentation yet
DepartmentId *int `json:"departmentId,omitempty" xmlrpc:"departmentId,omitempty"`

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

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

// no documentation yet
type User_Permission_Department struct {
Entity

// Department description
Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"`

// Department primary identifier
Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"`

// Department key name
KeyName *string `json:"keyName,omitempty" xmlrpc:"keyName,omitempty"`

// Department readable name
Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"`

// A count of
PermissionCount *uint `json:"permissionCount,omitempty" xmlrpc:"permissionCount,omitempty"`

// no documentation yet
Permissions []User_Permission_Action `json:"permissions,omitempty" xmlrpc:"permissions,omitempty"`
}

// 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]].
//
// 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.
Expand Down
6 changes: 3 additions & 3 deletions services/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -3504,7 +3504,7 @@ func (r Account_Lockdown_Request) CancelRequest() (err error) {
return
}

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

// 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.
// 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.
func (r Account_Lockdown_Request) DisconnectCompute(accountId *int, disconnectDate *string) (resp int, err error) {
params := []interface{}{
accountId,
Expand All @@ -3539,7 +3539,7 @@ func (r Account_Lockdown_Request) GetObject() (resp datatypes.Account_Lockdown_R
return
}

// 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.
// 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.
func (r Account_Lockdown_Request) ReconnectCompute(reconnectDate *string) (resp int, err error) {
params := []interface{}{
reconnectDate,
Expand Down
6 changes: 6 additions & 0 deletions services/hardware.go
Original file line number Diff line number Diff line change
Expand Up @@ -1879,6 +1879,12 @@ func (r Hardware_Component_Model) GetValidAttributeTypes() (resp []datatypes.Har
return
}

// Retrieve
func (r Hardware_Component_Model) GetVmwareQualifiedFirmwares() (resp []datatypes.Hardware_Component_Firmware, err error) {
err = r.Session.DoRequest("SoftLayer_Hardware_Component_Model", "getVmwareQualifiedFirmwares", nil, &r.Options, &resp)
return
}

// The SoftLayer_Hardware_Component_Partition_OperatingSystem data type contains general information relating to a single SoftLayer Operating System Partition Template.
type Hardware_Component_Partition_OperatingSystem struct {
Session session.SLSession
Expand Down
7 changes: 7 additions & 0 deletions services/hardware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1646,6 +1646,13 @@ var _ = Describe("Hardware Tests", func() {
Expect(slsession.DoRequestCallCount()).To(Equal(1))
})
})
Context("SoftLayer_Hardware_Component_Model::getVmwareQualifiedFirmwares", func() {
It("API Call Test", func() {
_, err := sl_service.GetVmwareQualifiedFirmwares()
Expect(err).To(Succeed())
Expect(slsession.DoRequestCallCount()).To(Equal(1))
})
})
})

Context("Testing SoftLayer_Hardware_Component_Partition_OperatingSystem service", func() {
Expand Down
14 changes: 1 addition & 13 deletions services/location.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/softlayer/softlayer-go/sl"
)

// 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.
// 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.
type Location struct {
Session session.SLSession
Options sl.Options
Expand Down Expand Up @@ -74,12 +74,6 @@ func (r Location) GetAvailableObjectStorageDatacenters() (resp []datatypes.Locat
return
}

// Retrieve
func (r Location) GetBackboneDependents() (resp []datatypes.Network_Backbone_Location_Dependent, err error) {
err = r.Session.DoRequest("SoftLayer_Location", "getBackboneDependents", nil, &r.Options, &resp)
return
}

// Retrieve A flag indicating whether or not the datacenter/location is BNPP compliant.
func (r Location) GetBnppCompliantFlag() (resp bool, err error) {
err = r.Session.DoRequest("SoftLayer_Location", "getBnppCompliantFlag", nil, &r.Options, &resp)
Expand Down Expand Up @@ -270,12 +264,6 @@ func (r Location_Datacenter) GetAvailableObjectStorageDatacenters() (resp []data
return
}

// Retrieve
func (r Location_Datacenter) GetBackboneDependents() (resp []datatypes.Network_Backbone_Location_Dependent, err error) {
err = r.Session.DoRequest("SoftLayer_Location_Datacenter", "getBackboneDependents", nil, &r.Options, &resp)
return
}

// Retrieve
func (r Location_Datacenter) GetBackendHardwareRouters() (resp []datatypes.Hardware, err error) {
err = r.Session.DoRequest("SoftLayer_Location_Datacenter", "getBackendHardwareRouters", nil, &r.Options, &resp)
Expand Down
14 changes: 0 additions & 14 deletions services/location_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,6 @@ var _ = Describe("Location Tests", func() {
Expect(slsession.DoRequestCallCount()).To(Equal(1))
})
})
Context("SoftLayer_Location::getBackboneDependents", func() {
It("API Call Test", func() {
_, err := sl_service.GetBackboneDependents()
Expect(err).To(Succeed())
Expect(slsession.DoRequestCallCount()).To(Equal(1))
})
})
Context("SoftLayer_Location::getBnppCompliantFlag", func() {
It("API Call Test", func() {
_, err := sl_service.GetBnppCompliantFlag()
Expand Down Expand Up @@ -268,13 +261,6 @@ var _ = Describe("Location Tests", func() {
Expect(slsession.DoRequestCallCount()).To(Equal(1))
})
})
Context("SoftLayer_Location_Datacenter::getBackboneDependents", func() {
It("API Call Test", func() {
_, err := sl_service.GetBackboneDependents()
Expect(err).To(Succeed())
Expect(slsession.DoRequestCallCount()).To(Equal(1))
})
})
Context("SoftLayer_Location_Datacenter::getBackendHardwareRouters", func() {
It("API Call Test", func() {
_, err := sl_service.GetBackendHardwareRouters()
Expand Down
Loading

0 comments on commit 2ecaf6f

Please sign in to comment.