diff --git a/datatypes/container.go b/datatypes/container.go index 7d85032..28083c6 100644 --- a/datatypes/container.go +++ b/datatypes/container.go @@ -1999,6 +1999,34 @@ type Container_Hardware_Server_Request struct { SuccessFlag *bool `json:"successFlag,omitempty" xmlrpc:"successFlag,omitempty"` } +// no documentation yet +type Container_Image_StorageGroupDetails struct { + Entity + + // no documentation yet + Drives []Container_Image_StorageGroupDetails_Drives `json:"drives,omitempty" xmlrpc:"drives,omitempty"` + + // no documentation yet + StorageGroupName *string `json:"storageGroupName,omitempty" xmlrpc:"storageGroupName,omitempty"` + + // no documentation yet + StorageGroupType *string `json:"storageGroupType,omitempty" xmlrpc:"storageGroupType,omitempty"` +} + +// no documentation yet +type Container_Image_StorageGroupDetails_Drives struct { + Entity + + // no documentation yet + Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"` + + // no documentation yet + DiskSpace *string `json:"diskSpace,omitempty" xmlrpc:"diskSpace,omitempty"` + + // no documentation yet + Units *string `json:"units,omitempty" xmlrpc:"units,omitempty"` +} + // SoftLayer_Container_KnowledgeLayer_QuestionAnswer models a single question and answer pair from SoftLayer's KnowledgeLayer knowledge base. SoftLayer's backend network interfaces with the KnowledgeLayer to recommend helpful articles when support tickets are created. type Container_KnowledgeLayer_QuestionAnswer struct { Entity @@ -2125,7 +2153,7 @@ type Container_Monitoring_Alarm_History struct { // Account ID that this alarm belongs to AccountId *int `json:"accountId,omitempty" xmlrpc:"accountId,omitempty"` - // ID of the monitoring agent that triggered this alarm + // DEPRECATED. ID of the monitoring agent that triggered this alarm AgentId *int `json:"agentId,omitempty" xmlrpc:"agentId,omitempty"` // Alarm ID @@ -2140,30 +2168,13 @@ type Container_Monitoring_Alarm_History struct { // Alarm message Message *string `json:"message,omitempty" xmlrpc:"message,omitempty"` - // Robot ID + // DEPRECATED. Robot ID RobotId *int `json:"robotId,omitempty" xmlrpc:"robotId,omitempty"` // Severity of an alarm Severity *string `json:"severity,omitempty" xmlrpc:"severity,omitempty"` } -// SoftLayer_Container_Monitoring_Graph_Outputs models a single outbound object for a graph of given data sets. -type Container_Monitoring_Graph_Outputs struct { - Entity - - // The maximum date included in this graph. - EndDate *Time `json:"endDate,omitempty" xmlrpc:"endDate,omitempty"` - - // Error message encountered during graphing - GraphError *string `json:"graphError,omitempty" xmlrpc:"graphError,omitempty"` - - // The raw PNG binary data to be displayed once the graph is drawn. - GraphImage *[]byte `json:"graphImage,omitempty" xmlrpc:"graphImage,omitempty"` - - // The minimum date included in this graph. - StartDate *Time `json:"startDate,omitempty" xmlrpc:"startDate,omitempty"` -} - // This object holds authentication data to a server. type Container_Network_Authentication_Data struct { Entity diff --git a/datatypes/hardware.go b/datatypes/hardware.go index 5f85f9e..094c709 100644 --- a/datatypes/hardware.go +++ b/datatypes/hardware.go @@ -315,13 +315,13 @@ type Hardware struct { // no documentation yet Modules []Hardware_Component `json:"modules,omitempty" xmlrpc:"modules,omitempty"` - // Information regarding the hardware's monitoring robot. + // no documentation yet MonitoringRobot *Monitoring_Robot `json:"monitoringRobot,omitempty" xmlrpc:"monitoringRobot,omitempty"` // Information regarding a piece of hardware's network monitoring services. MonitoringServiceComponent *Network_Monitor_Version1_Query_Host_Stratum `json:"monitoringServiceComponent,omitempty" xmlrpc:"monitoringServiceComponent,omitempty"` - // The monitoring service flag eligibility status for a piece of hardware. + // no documentation yet MonitoringServiceEligibilityFlag *bool `json:"monitoringServiceEligibilityFlag,omitempty" xmlrpc:"monitoringServiceEligibilityFlag,omitempty"` // Information regarding a piece of hardware's motherboard. diff --git a/datatypes/monitoring.go b/datatypes/monitoring.go index 2d7521e..dd6eab9 100644 --- a/datatypes/monitoring.go +++ b/datatypes/monitoring.go @@ -20,33 +20,24 @@ package datatypes -// The SoftLayer_Monitoring_Robot data type contains general information relating to a monitoring robot. +// DEPRECATED. The SoftLayer_Monitoring_Robot data type contains general information relating to a monitoring robot. type Monitoring_Robot struct { Entity - // The account associated with the corresponding robot. - Account *Account `json:"account,omitempty" xmlrpc:"account,omitempty"` - - // Internal identifier of a SoftLayer account that this robot belongs to + // DEPRECATED. Internal identifier of a SoftLayer account that this robot belongs to AccountId *int `json:"accountId,omitempty" xmlrpc:"accountId,omitempty"` - // Internal identifier of a monitoring robot + // DEPRECATED. Internal identifier of a monitoring robot Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"` - // Robot name + // DEPRECATED. Robot name Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"` - // The current status of the robot. - RobotStatus *Monitoring_Robot_Status `json:"robotStatus,omitempty" xmlrpc:"robotStatus,omitempty"` - - // The SoftLayer_Software_Component that corresponds to the robot installation on the server. - SoftwareComponent *Software_Component `json:"softwareComponent,omitempty" xmlrpc:"softwareComponent,omitempty"` - - // Internal identifier of a monitoring robot status + // DEPRECATED. Internal identifier of a monitoring robot status StatusId *int `json:"statusId,omitempty" xmlrpc:"statusId,omitempty"` } -// Your monitoring robot will be in "Active" status under normal circumstances. If you perform an OS reload, your robot will be in "Reclaim" status until it's reloaded on your server or virtual server. +// DEPRECATED. Your monitoring robot will be in "Active" status under normal circumstances. If you perform an OS reload, your robot will be in "Reclaim" status until it's reloaded on your server or virtual server. // // Advanced monitoring system requires "Nimsoft Monitoring (Advanced)" service running and TCP ports 48000 - 48020 to be open on your server or virtual server. Monitoring agents cannot be managed nor can the usage data be updated if these ports are closed. Your monitoring robot will be in "Limited Connectivity" status if our monitoring management system cannot communicate with your system. // @@ -54,12 +45,12 @@ type Monitoring_Robot struct { type Monitoring_Robot_Status struct { Entity - // Monitoring robot status description + // DEPRECATED. Monitoring robot status description Description *string `json:"description,omitempty" xmlrpc:"description,omitempty"` - // Internal identifier of a monitoring robot status + // DEPRECATED. Internal identifier of a monitoring robot status Id *int `json:"id,omitempty" xmlrpc:"id,omitempty"` - // Monitoring robot status name + // DEPRECATED. Monitoring robot status name Name *string `json:"name,omitempty" xmlrpc:"name,omitempty"` } diff --git a/datatypes/network.go b/datatypes/network.go index dbd68a4..4bdadc3 100644 --- a/datatypes/network.go +++ b/datatypes/network.go @@ -3725,31 +3725,6 @@ type Network_Service_Resource_Hub_Swift struct { Network_Service_Resource_Hub } -// no documentation yet -type Network_Service_Resource_MonitoringHub struct { - Network_Service_Resource - - // no documentation yet - AdnServicesIp *string `json:"adnServicesIp,omitempty" xmlrpc:"adnServicesIp,omitempty"` - - // no documentation yet - HubAddress *string `json:"hubAddress,omitempty" xmlrpc:"hubAddress,omitempty"` - - // no documentation yet - HubConnectionTimeout *string `json:"hubConnectionTimeout,omitempty" xmlrpc:"hubConnectionTimeout,omitempty"` - - // no documentation yet - RobotsCount *string `json:"robotsCount,omitempty" xmlrpc:"robotsCount,omitempty"` - - // no documentation yet - RobotsMax *string `json:"robotsMax,omitempty" xmlrpc:"robotsMax,omitempty"` -} - -// no documentation yet -type Network_Service_Resource_NimsoftLandingHub struct { - Network_Service_Resource_MonitoringHub -} - // no documentation yet type Network_Service_Resource_Type struct { Entity @@ -4889,17 +4864,6 @@ type Network_Storage_Nas struct { RecentBytesUsed *Network_Storage_Daily_Usage `json:"recentBytesUsed,omitempty" xmlrpc:"recentBytesUsed,omitempty"` } -// The SoftLayer_Network_Storage_OpenStack_Object data type models OpenStack specific object storage objects. These storages authenticate through Keystone to access Swift. -type Network_Storage_OpenStack_Object struct { - Network_Storage - - // A count of the billing item tied to an OpenStack Object Storage's bandwidth service. - BandwidthBillingItemCount *uint `json:"bandwidthBillingItemCount,omitempty" xmlrpc:"bandwidthBillingItemCount,omitempty"` - - // The billing item tied to an OpenStack Object Storage's bandwidth service. - BandwidthBillingItems []Billing_Item `json:"bandwidthBillingItems,omitempty" xmlrpc:"bandwidthBillingItems,omitempty"` -} - // A network storage partnership is used to link multiple volumes to each other. These partnerships describe replication hierarchies or link volume snapshots to their associated storage volume. type Network_Storage_Partnership struct { Entity diff --git a/datatypes/provisioning.go b/datatypes/provisioning.go index e79fac2..d1008c4 100644 --- a/datatypes/provisioning.go +++ b/datatypes/provisioning.go @@ -296,8 +296,3 @@ type Provisioning_Version1_Transaction_Status struct { // no documentation yet NonCompletedTransactions []Provisioning_Version1_Transaction `json:"nonCompletedTransactions,omitempty" xmlrpc:"nonCompletedTransactions,omitempty"` } - -// no documentation yet -type Provisioning_Version1_Transaction_SubnetMigration struct { - Provisioning_Version1_Transaction -} diff --git a/datatypes/virtual.go b/datatypes/virtual.go index ad6c783..40ae4fd 100644 --- a/datatypes/virtual.go +++ b/datatypes/virtual.go @@ -182,7 +182,7 @@ type Virtual_Disk_Image struct { StorageGroupCount *uint `json:"storageGroupCount,omitempty" xmlrpc:"storageGroupCount,omitempty"` // Return storage group details for symantec disk - StorageGroupDetails *string `json:"storageGroupDetails,omitempty" xmlrpc:"storageGroupDetails,omitempty"` + StorageGroupDetails *Container_Image_StorageGroupDetails `json:"storageGroupDetails,omitempty" xmlrpc:"storageGroupDetails,omitempty"` // The storage group for a virtual disk image. StorageGroups []Configuration_Storage_Group `json:"storageGroups,omitempty" xmlrpc:"storageGroups,omitempty"` diff --git a/services/account.go b/services/account.go index 7fc6ba3..a065ee3 100644 --- a/services/account.go +++ b/services/account.go @@ -150,7 +150,7 @@ func (r Account) DisableEuSupport() (err error) { return } -// This method will edit the account's information. Pass in a SoftLayer_Account template with the fields to be modified. Certain changes to the account will automatically create a ticket for manual review. This will be returned with the SoftLayer_Container_Account_Update_Response.

The following fields are editable:

+// This method will edit the account's information. Pass in a SoftLayer_Account template with the fields to be modified. Certain changes to the account will automatically create a ticket for manual review. This will be returned with the SoftLayer_Container_Account_Update_Response.

The following fields are editable:

func (r Account) EditAccount(modifiedAccountInformation *datatypes.Account) (resp datatypes.Container_Account_Update_Response, err error) { params := []interface{}{ modifiedAccountInformation, @@ -2227,7 +2227,7 @@ func (r Account) UpdateVpnUsersForResource(objectId *int, objectType *string) (r return } -// This method will validate the following account fields. Included are the allowed characters for each field.
Company Name (required): alphabet, numbers, space, period, dash, octothorpe, forward slash, backward slash, comma, colon, at sign, ampersand, underscore, apostrophe, parenthesis, exclamation point. (Note: may not contain an email address)
First Name (required): alphabet, space, period, dash, comma, apostrophe.
Last Name (required): alphabet, space, period, dash, comma, apostrophe.
Email (required): Validates e-mail addresses against the syntax in RFC 822.
Address 1 (required): alphabet, numbers, space, period, dash, octothorpe, forward slash, backward slash, comma, colon, at sign, ampersand, underscore, apostrophe, parentheses.
Address 2 (required): alphabet, numbers, space, period, dash, octothorpe, forward slash, backward slash, comma, colon, at sign, ampersand, underscore, apostrophe, parentheses.
City (required): alphabet, space, period, dash, apostrophe, forward slash.
State (required): Required if country is US, Brazil, Canada or India. Must be valid Alpha-2 ISO 3166-1 state code for that country.
Postal Code (required): alphabet, numbers, dash, space.
Country (required): alphabet, numbers. Must be valid Alpha-2 ISO 3166-1 country code.
Office Phone (required): alphabet, numbers, space, period, dash, parenthesis, plus sign.
Alternate Phone: alphabet, numbers, space, period, dash, parenthesis, plus sign.
Fax Phone: alphabet, numbers, space, period, dash, parenthesis, plus sign.
+// This method will validate the following account fields. Included are the allowed characters for each field.
Company Name (required): alphabet, numbers, space, period, dash, octothorpe, forward slash, comma, colon, at sign, ampersand, underscore, apostrophe, parenthesis, exclamation point. (Note: may not contain an email address)
First Name (required): alphabet, space, period, dash, comma, apostrophe.
Last Name (required): alphabet, space, period, dash, comma, apostrophe.
Email (required): Validates e-mail addresses against the syntax in RFC 822.
Address 1 (required): alphabet, numbers, space, period, dash, octothorpe, forward slash, comma, colon, at sign, ampersand, underscore, apostrophe, parentheses. (Note: may not contain an email address)
Address 2 (required): alphabet, numbers, space, period, dash, octothorpe, forward slash, comma, colon, at sign, ampersand, underscore, apostrophe, parentheses. (Note: may not contain an email address)
City (required): alphabet, numbers, space, period, dash, apostrophe, forward slash, comma.
State (required): Required if country is US, Brazil, Canada or India. Must be valid Alpha-2 ISO 3166-1 state code for that country.
Postal Code (required): alphabet, numbers, dash, space.
Country (required): alphabet, numbers. Must be valid Alpha-2 ISO 3166-1 country code.
Office Phone (required): alphabet, numbers, space, period, dash, parenthesis, plus sign.
Alternate Phone: alphabet, numbers, space, period, dash, parenthesis, plus sign.
Fax Phone: alphabet, numbers, space, period, dash, parenthesis, plus sign.
func (r Account) Validate(account *datatypes.Account) (resp []string, err error) { params := []interface{}{ account, diff --git a/services/hardware.go b/services/hardware.go index 08fa6a0..e8fe1e0 100644 --- a/services/hardware.go +++ b/services/hardware.go @@ -923,7 +923,7 @@ func (r Hardware) GetModules() (resp []datatypes.Hardware_Component, err error) return } -// Retrieve Information regarding the hardware's monitoring robot. +// Retrieve func (r Hardware) GetMonitoringRobot() (resp datatypes.Monitoring_Robot, err error) { err = r.Session.DoRequest("SoftLayer_Hardware", "getMonitoringRobot", nil, &r.Options, &resp) return @@ -935,7 +935,7 @@ func (r Hardware) GetMonitoringServiceComponent() (resp datatypes.Network_Monito return } -// Retrieve The monitoring service flag eligibility status for a piece of hardware. +// Retrieve func (r Hardware) GetMonitoringServiceEligibilityFlag() (resp bool, err error) { err = r.Session.DoRequest("SoftLayer_Hardware", "getMonitoringServiceEligibilityFlag", nil, &r.Options, &resp) return @@ -2910,7 +2910,7 @@ func (r Hardware_Router) GetModules() (resp []datatypes.Hardware_Component, err return } -// Retrieve Information regarding the hardware's monitoring robot. +// Retrieve func (r Hardware_Router) GetMonitoringRobot() (resp datatypes.Monitoring_Robot, err error) { err = r.Session.DoRequest("SoftLayer_Hardware_Router", "getMonitoringRobot", nil, &r.Options, &resp) return @@ -2922,7 +2922,7 @@ func (r Hardware_Router) GetMonitoringServiceComponent() (resp datatypes.Network return } -// Retrieve The monitoring service flag eligibility status for a piece of hardware. +// Retrieve func (r Hardware_Router) GetMonitoringServiceEligibilityFlag() (resp bool, err error) { err = r.Session.DoRequest("SoftLayer_Hardware_Router", "getMonitoringServiceEligibilityFlag", nil, &r.Options, &resp) return @@ -4788,7 +4788,7 @@ func (r Hardware_SecurityModule) GetModules() (resp []datatypes.Hardware_Compone return } -// Retrieve Information regarding the hardware's monitoring robot. +// Retrieve func (r Hardware_SecurityModule) GetMonitoringRobot() (resp datatypes.Monitoring_Robot, err error) { err = r.Session.DoRequest("SoftLayer_Hardware_SecurityModule", "getMonitoringRobot", nil, &r.Options, &resp) return @@ -4800,7 +4800,7 @@ func (r Hardware_SecurityModule) GetMonitoringServiceComponent() (resp datatypes return } -// Retrieve The monitoring service flag eligibility status for a piece of hardware. +// Retrieve func (r Hardware_SecurityModule) GetMonitoringServiceEligibilityFlag() (resp bool, err error) { err = r.Session.DoRequest("SoftLayer_Hardware_SecurityModule", "getMonitoringServiceEligibilityFlag", nil, &r.Options, &resp) return @@ -7152,7 +7152,7 @@ func (r Hardware_SecurityModule750) GetModules() (resp []datatypes.Hardware_Comp return } -// Retrieve Information regarding the hardware's monitoring robot. +// Retrieve func (r Hardware_SecurityModule750) GetMonitoringRobot() (resp datatypes.Monitoring_Robot, err error) { err = r.Session.DoRequest("SoftLayer_Hardware_SecurityModule750", "getMonitoringRobot", nil, &r.Options, &resp) return @@ -7164,7 +7164,7 @@ func (r Hardware_SecurityModule750) GetMonitoringServiceComponent() (resp dataty return } -// Retrieve The monitoring service flag eligibility status for a piece of hardware. +// Retrieve func (r Hardware_SecurityModule750) GetMonitoringServiceEligibilityFlag() (resp bool, err error) { err = r.Session.DoRequest("SoftLayer_Hardware_SecurityModule750", "getMonitoringServiceEligibilityFlag", nil, &r.Options, &resp) return @@ -9516,7 +9516,7 @@ func (r Hardware_Server) GetModules() (resp []datatypes.Hardware_Component, err return } -// Retrieve Information regarding the hardware's monitoring robot. +// Retrieve func (r Hardware_Server) GetMonitoringRobot() (resp datatypes.Monitoring_Robot, err error) { err = r.Session.DoRequest("SoftLayer_Hardware_Server", "getMonitoringRobot", nil, &r.Options, &resp) return @@ -9528,7 +9528,7 @@ func (r Hardware_Server) GetMonitoringServiceComponent() (resp datatypes.Network return } -// Retrieve The monitoring service flag eligibility status for a piece of hardware. +// Retrieve func (r Hardware_Server) GetMonitoringServiceEligibilityFlag() (resp bool, err error) { err = r.Session.DoRequest("SoftLayer_Hardware_Server", "getMonitoringServiceEligibilityFlag", nil, &r.Options, &resp) return diff --git a/services/monitoring.go b/services/monitoring.go index 61deb16..99ce6a4 100644 --- a/services/monitoring.go +++ b/services/monitoring.go @@ -29,7 +29,7 @@ import ( "github.com/softlayer/softlayer-go/sl" ) -// The SoftLayer_Monitoring_Robot data type contains general information relating to a monitoring robot. +// DEPRECATED. The SoftLayer_Monitoring_Robot data type contains general information relating to a monitoring robot. type Monitoring_Robot struct { Session *session.Session Options sl.Options @@ -69,7 +69,7 @@ func (r Monitoring_Robot) Offset(offset int) Monitoring_Robot { return r } -// Checks if a monitoring robot can communicate with SoftLayer monitoring management system via the private network. +// DEPRECATED. Checks if a monitoring robot can communicate with SoftLayer monitoring management system via the private network. // // TCP port 48000 - 48002 must be open on your server or your virtual server in order for this test to succeed. func (r Monitoring_Robot) CheckConnection() (resp bool, err error) { @@ -77,26 +77,8 @@ func (r Monitoring_Robot) CheckConnection() (resp bool, err error) { return } -// Retrieve The account associated with the corresponding robot. -func (r Monitoring_Robot) GetAccount() (resp datatypes.Account, err error) { - err = r.Session.DoRequest("SoftLayer_Monitoring_Robot", "getAccount", nil, &r.Options, &resp) - return -} - // no documentation yet func (r Monitoring_Robot) GetObject() (resp datatypes.Monitoring_Robot, err error) { err = r.Session.DoRequest("SoftLayer_Monitoring_Robot", "getObject", nil, &r.Options, &resp) return } - -// Retrieve The current status of the robot. -func (r Monitoring_Robot) GetRobotStatus() (resp datatypes.Monitoring_Robot_Status, err error) { - err = r.Session.DoRequest("SoftLayer_Monitoring_Robot", "getRobotStatus", nil, &r.Options, &resp) - return -} - -// Retrieve The SoftLayer_Software_Component that corresponds to the robot installation on the server. -func (r Monitoring_Robot) GetSoftwareComponent() (resp datatypes.Software_Component, err error) { - err = r.Session.DoRequest("SoftLayer_Monitoring_Robot", "getSoftwareComponent", nil, &r.Options, &resp) - return -} diff --git a/services/resource.go b/services/resource.go index 47a7731..4381426 100644 --- a/services/resource.go +++ b/services/resource.go @@ -291,6 +291,12 @@ func (r Resource_Metadata) Offset(offset int) Resource_Metadata { return r } +// The getAccountId retrieves the ID for the account on which the resource is located. +func (r Resource_Metadata) GetAccountId() (resp int, err error) { + err = r.Session.DoRequest("SoftLayer_Resource_Metadata", "getAccountId", nil, &r.Options, &resp) + return +} + // The getBackendMacAddresses method retrieves a list of backend MAC addresses for the resource func (r Resource_Metadata) GetBackendMacAddresses() (resp []string, err error) { err = r.Session.DoRequest("SoftLayer_Resource_Metadata", "getBackendMacAddresses", nil, &r.Options, &resp) diff --git a/services/virtual.go b/services/virtual.go index cad2df8..feda831 100644 --- a/services/virtual.go +++ b/services/virtual.go @@ -322,7 +322,7 @@ func (r Virtual_Disk_Image) GetSourceDiskImage() (resp datatypes.Virtual_Disk_Im } // Retrieve Return storage group details for symantec disk -func (r Virtual_Disk_Image) GetStorageGroupDetails() (resp string, err error) { +func (r Virtual_Disk_Image) GetStorageGroupDetails() (resp datatypes.Container_Image_StorageGroupDetails, err error) { err = r.Session.DoRequest("SoftLayer_Virtual_Disk_Image", "getStorageGroupDetails", nil, &r.Options, &resp) return }