Skip to content

Commit 35f62f4

Browse files
committed
Move dynamic attribute network_monitors from server subclasses into parent Server
1 parent ec51edb commit 35f62f4

2 files changed

Lines changed: 19 additions & 20 deletions

File tree

lib/softlayer/BareMetalServer.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,6 @@ module SoftLayer
1717
# http://sldn.softlayer.com/reference/datatypes/SoftLayer_Hardware_Server
1818
#
1919
class BareMetalServer < Server
20-
include ::SoftLayer::DynamicAttribute
21-
22-
##
23-
# A lsst of configured network monitors.
24-
#
25-
sl_dynamic_attr :network_monitors do |resource|
26-
resource.should_update? do
27-
@network_monitors == nil
28-
end
29-
30-
resource.to_update do
31-
network_monitors_data = self.service.object_mask(NetworkMonitor.default_object_mask).getNetworkMonitors
32-
33-
network_monitors_data.map! do |network_monitor|
34-
NetworkMonitor.new(softlayer_client, network_monitor) unless network_monitor.empty?
35-
end
36-
37-
network_monitors_data.compact
38-
end
39-
end
4020

4121
##
4222
# Add user customers to the list of users notified on monitor failure. Accepts a list of UserCustomer

lib/softlayer/Server.rb

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,25 @@ class Server < SoftLayer::ModelBase
5353
# Notes about these server (for use by the customer)
5454
sl_attr :notes
5555

56+
##
57+
# A lsst of configured network monitors.
58+
#
59+
sl_dynamic_attr :network_monitors do |resource|
60+
resource.should_update? do
61+
@network_monitors == nil
62+
end
63+
64+
resource.to_update do
65+
network_monitors_data = self.service.object_mask(NetworkMonitor.default_object_mask).getNetworkMonitors
66+
67+
network_monitors_data.map! do |network_monitor|
68+
NetworkMonitor.new(softlayer_client, network_monitor) unless network_monitor.empty?
69+
end
70+
71+
network_monitors_data.compact
72+
end
73+
end
74+
5675
##
5776
# :attr_reader:
5877
# The list of user customers notified on monitoring failures

0 commit comments

Comments
 (0)