softlayer 0.0.7 → 0.0.8

data/lib/softlayer/hardware.rb

@@ -212,28 +212,28 @@ module Softlayer
     attr_accessor :virtual_rack_name
     attr_accessor :virtualization_platform
 
-    def allow_access_to_network_storage(network_storage_template_object = nil)
-      message = {network_storage_template_object: network_storage_template_object}
+    # network_storage_template_object
+    def allow_access_to_network_storage(message)
       request(:allow_access_to_network_storage, Boolean, message)
     end
 
-    def allow_access_to_network_storage_list(network_storage_template_objects = nil)
-      message = {network_storage_template_objects: network_storage_template_objects}
+    # network_storage_template_objects
+    def allow_access_to_network_storage_list(message)
       request(:allow_access_to_network_storage_list, Boolean, message)
     end
 
-    def capture_image(capture_template = nil)
-      message = {capture_template: capture_template}
+    # capture_template
+    def capture_image(message)
       request(:capture_image, Softlayer::Virtual::Guest::Block::Device::Template::Group, message)
     end
 
-    def close_alarm(alarm_id = nil)
-      message = {alarm_id: alarm_id}
+    # alarm_id
+    def close_alarm(message)
       request(:close_alarm, Boolean, message)
     end
 
-    def self.create_object(template_object = nil)
-      message = {template_object: template_object}
+    # template_object
+    def self.create_object(message)
       request(:create_object, Softlayer::Hardware, message)
     end
 
@@ -241,28 +241,28 @@ module Softlayer
       request(:delete_object, Boolean)
     end
 
-    def delete_software_component_passwords(software_component_passwords = nil)
-      message = {software_component_passwords: software_component_passwords}
+    # software_component_passwords
+    def delete_software_component_passwords(message)
       request(:delete_software_component_passwords, Boolean, message)
     end
 
-    def edit_software_component_passwords(software_component_passwords = nil)
-      message = {software_component_passwords: software_component_passwords}
+    # software_component_passwords
+    def edit_software_component_passwords(message)
       request(:edit_software_component_passwords, Boolean, message)
     end
 
-    def execute_remote_script(uri = nil)
-      message = {uri: uri}
+    # uri
+    def execute_remote_script(message)
       request(:execute_remote_script, nil, message)
     end
 
-    def self.find_by_ip_address(ip_address = nil)
-      message = {ip_address: ip_address}
+    # ip_address
+    def self.find_by_ip_address(message)
       request(:find_by_ip_address, Softlayer::Hardware, message)
     end
 
-    def self.generate_order_template(template_object = nil)
-      message = {template_object: template_object}
+    # template_object
+    def self.generate_order_template(message)
       request(:generate_order_template, Softlayer::Container::Product::Order, message)
     end
 
@@ -278,8 +278,10 @@ module Softlayer
       request(:get_active_network_monitor_incident, Array[Softlayer::Network::Monitor::Version1::Incident])
     end
 
-    def get_alarm_history(start_date = nil, end_date = nil, alarm_id = nil)
-      message = {start_date: start_date, end_date: end_date, alarm_id: alarm_id}
+    # start_date
+    # end_date
+    # alarm_id
+    def get_alarm_history(message)
       request(:get_alarm_history, Array[Softlayer::Container::Monitoring::Alarm::History], message)
     end
 
@@ -303,8 +305,8 @@ module Softlayer
       request(:get_antivirus_spyware_software_component, Softlayer::Software::Component)
     end
 
-    def get_attached_network_storages(nas_type = nil)
-      message = {nas_type: nas_type}
+    # nas_type
+    def get_attached_network_storages(message)
       request(:get_attached_network_storages, Array[Softlayer::Network::Storage], message)
     end
 
@@ -312,8 +314,8 @@ module Softlayer
       request(:get_attributes, Array[Softlayer::Hardware::Attribute])
     end
 
-    def get_available_network_storages(nas_type = nil)
-      message = {nas_type: nas_type}
+    # nas_type
+    def get_available_network_storages(message)
       request(:get_available_network_storages, Array[Softlayer::Network::Storage], message)
     end
 
@@ -321,8 +323,9 @@ module Softlayer
       request(:get_average_daily_public_bandwidth_usage, Float)
     end
 
-    def get_backend_incoming_bandwidth(start_date = nil, end_date = nil)
-      message = {start_date: start_date, end_date: end_date}
+    # start_date
+    # end_date
+    def get_backend_incoming_bandwidth(message)
       request(:get_backend_incoming_bandwidth, Float, message)
     end
 
@@ -330,8 +333,9 @@ module Softlayer
       request(:get_backend_network_components, Array[Softlayer::Network::Component])
     end
 
-    def get_backend_outgoing_bandwidth(start_date = nil, end_date = nil)
-      message = {start_date: start_date, end_date: end_date}
+    # start_date
+    # end_date
+    def get_backend_outgoing_bandwidth(message)
       request(:get_backend_outgoing_bandwidth, Float, message)
     end
 
@@ -391,8 +395,9 @@ module Softlayer
       request(:get_current_billing_total, Float)
     end
 
-    def get_daily_average(start_date = nil, end_date = nil)
-      message = {start_date: start_date, end_date: end_date}
+    # start_date
+    # end_date
+    def get_daily_average(message)
       request(:get_daily_average, Float, message)
     end
 
@@ -456,8 +461,9 @@ module Softlayer
       request(:get_fixed_configuration_preset, Softlayer::Product::Package::Preset)
     end
 
-    def get_frontend_incoming_bandwidth(start_date = nil, end_date = nil)
-      message = {start_date: start_date, end_date: end_date}
+    # start_date
+    # end_date
+    def get_frontend_incoming_bandwidth(message)
       request(:get_frontend_incoming_bandwidth, Float, message)
     end
 
@@ -465,8 +471,9 @@ module Softlayer
       request(:get_frontend_network_components, Array[Softlayer::Network::Component])
     end
 
-    def get_frontend_outgoing_bandwidth(start_date = nil, end_date = nil)
-      message = {start_date: start_date, end_date: end_date}
+    # start_date
+    # end_date
+    def get_frontend_outgoing_bandwidth(message)
       request(:get_frontend_outgoing_bandwidth, Float, message)
     end
 
@@ -506,8 +513,9 @@ module Softlayer
       request(:get_host_ips_software_component, Softlayer::Software::Component)
     end
 
-    def get_hourly_bandwidth(mode = nil, day = nil)
-      message = {mode: mode, day: day}
+    # mode
+    # day
+    def get_hourly_bandwidth(message)
       request(:get_hourly_bandwidth, Array[Softlayer::Metric::Tracking::Object::Data], message)
     end
 
@@ -559,8 +567,9 @@ module Softlayer
       request(:get_metric_tracking_object, Softlayer::Metric::Tracking::Object::HardwareServer)
     end
 
-    def get_monitoring_active_alarms(start_date = nil, end_date = nil)
-      message = {start_date: start_date, end_date: end_date}
+    # start_date
+    # end_date
+    def get_monitoring_active_alarms(message)
       request(:get_monitoring_active_alarms, Array[Softlayer::Container::Monitoring::Alarm::History], message)
     end
 
@@ -568,8 +577,9 @@ module Softlayer
       request(:get_monitoring_agents, Array[Softlayer::Monitoring::Agent])
     end
 
-    def get_monitoring_closed_alarms(start_date = nil, end_date = nil)
-      message = {start_date: start_date, end_date: end_date}
+    # start_date
+    # end_date
+    def get_monitoring_closed_alarms(message)
       request(:get_monitoring_closed_alarms, Array[Softlayer::Container::Monitoring::Alarm::History], message)
     end
 
@@ -701,8 +711,9 @@ module Softlayer
       request(:get_primary_network_component, Softlayer::Network::Component)
     end
 
-    def get_private_bandwidth_data(start_time = nil, end_time = nil)
-      message = {start_time: start_time, end_time: end_time}
+    # start_time
+    # end_time
+    def get_private_bandwidth_data(message)
       request(:get_private_bandwidth_data, Array[Softlayer::Metric::Tracking::Object::Data], message)
     end
 
@@ -722,8 +733,9 @@ module Softlayer
       request(:get_processors, Array[Softlayer::Hardware::Component])
     end
 
-    def get_public_bandwidth_data(start_time = nil, end_time = nil)
-      message = {start_time: start_time, end_time: end_time}
+    # start_time
+    # end_time
+    def get_public_bandwidth_data(message)
       request(:get_public_bandwidth_data, Array[Softlayer::Metric::Tracking::Object::Data], message)
     end
 
@@ -915,18 +927,18 @@ module Softlayer
       request(:reboot_soft, Boolean)
     end
 
-    def remove_access_to_network_storage(network_storage_template_object = nil)
-      message = {network_storage_template_object: network_storage_template_object}
+    # network_storage_template_object
+    def remove_access_to_network_storage(message)
       request(:remove_access_to_network_storage, Boolean, message)
     end
 
-    def remove_access_to_network_storage_list(network_storage_template_objects = nil)
-      message = {network_storage_template_objects: network_storage_template_objects}
+    # network_storage_template_objects
+    def remove_access_to_network_storage_list(message)
       request(:remove_access_to_network_storage_list, Boolean, message)
     end
 
-    def set_tags(tags = nil)
-      message = {tags: tags}
+    # tags
+    def set_tags(message)
       request(:set_tags, Boolean, message)
     end
 

data/lib/softlayer/layout/profile/containers.rb

@@ -11,13 +11,13 @@ module Softlayer
         attr_accessor :layout_container_type
         attr_accessor :layout_profile
 
-        def self.create_object(template_object = nil)
-          message = {template_object: template_object}
+        # template_object
+        def self.create_object(message)
           request(:create_object, Boolean, message)
         end
 
-        def edit_object(template_object = nil)
-          message = {template_object: template_object}
+        # template_object
+        def edit_object(message)
           request(:edit_object, Boolean, message)
         end
 

data/lib/softlayer/layout/profile/customer.rb

@@ -5,8 +5,8 @@ module Softlayer
         SERVICE = 'SoftLayer_Layout_Profile_Customer'
         attr_accessor :user_record
 
-        def self.create_object(template_object = nil)
-          message = {template_object: template_object}
+        # template_object
+        def self.create_object(message)
           request(:create_object, Boolean, message)
         end
 
@@ -14,8 +14,8 @@ module Softlayer
           request(:delete_object, Boolean)
         end
 
-        def edit_object(template_object = nil)
-          message = {template_object: template_object}
+        # template_object
+        def edit_object(message)
           request(:edit_object, Boolean, message)
         end
 
@@ -35,13 +35,13 @@ module Softlayer
           request(:get_user_record, Softlayer::User::Customer)
         end
 
-        def modify_preference(template_object = nil)
-          message = {template_object: template_object}
+        # template_object
+        def modify_preference(message)
           request(:modify_preference, Softlayer::Layout::Profile::Preference, message)
         end
 
-        def modify_preferences(layout_preference_objects = nil)
-          message = {layout_preference_objects: layout_preference_objects}
+        # layout_preference_objects
+        def modify_preferences(message)
           request(:modify_preferences, Array[Softlayer::Layout::Profile::Preference], message)
         end
 

data/lib/softlayer/layout/profile.rb

@@ -16,8 +16,8 @@ module Softlayer
       attr_accessor :layout_containers
       attr_accessor :layout_preferences
 
-      def self.create_object(template_object = nil)
-        message = {template_object: template_object}
+      # template_object
+      def self.create_object(message)
         request(:create_object, Boolean, message)
       end
 
@@ -25,8 +25,8 @@ module Softlayer
         request(:delete_object, Boolean)
       end
 
-      def edit_object(template_object = nil)
-        message = {template_object: template_object}
+      # template_object
+      def edit_object(message)
         request(:edit_object, Boolean, message)
       end
 
@@ -42,13 +42,13 @@ module Softlayer
         request(:get_object, Softlayer::Layout::Profile)
       end
 
-      def modify_preference(template_object = nil)
-        message = {template_object: template_object}
+      # template_object
+      def modify_preference(message)
         request(:modify_preference, Softlayer::Layout::Profile::Preference, message)
       end
 
-      def modify_preferences(layout_preference_objects = nil)
-        message = {layout_preference_objects: layout_preference_objects}
+      # layout_preference_objects
+      def modify_preferences(message)
         request(:modify_preferences, Array[Softlayer::Layout::Profile::Preference], message)
       end
 

data/lib/softlayer/marketplace/partner.rb

@@ -34,8 +34,8 @@ module Softlayer
         request(:get_all_objects, Array[Softlayer::Marketplace::Partner])
       end
 
-      def self.get_all_published_partners(search_term = nil)
-        message = {search_term: search_term}
+      # search_term
+      def self.get_all_published_partners(message)
         request(:get_all_published_partners, Array[Softlayer::Marketplace::Partner], message)
       end
 
@@ -43,13 +43,13 @@ module Softlayer
         request(:get_attachments, Array[Softlayer::Marketplace::Partner::Attachment])
       end
 
-      def self.get_featured_partners(non = nil)
-        message = {non: non}
+      # non
+      def self.get_featured_partners(message)
         request(:get_featured_partners, Array[Softlayer::Marketplace::Partner], message)
       end
 
-      def get_file(name = nil)
-        message = {name: name}
+      # name
+      def get_file(message)
         request(:get_file, Softlayer::Marketplace::Partner::File, message)
       end
 
@@ -73,8 +73,8 @@ module Softlayer
         request(:get_object, Softlayer::Marketplace::Partner)
       end
 
-      def self.get_partner_by_url_identifier(url_identifier = nil)
-        message = {url_identifier: url_identifier}
+      # url_identifier
+      def self.get_partner_by_url_identifier(message)
         request(:get_partner_by_url_identifier, Softlayer::Marketplace::Partner, message)
       end
 

data/lib/softlayer/metric/tracking/object.rb

@@ -17,38 +17,54 @@ module Softlayer
         attr_accessor :start_date
         attr_accessor :type
 
-        def get_backbone_bandwidth_graph(graph_title = nil)
-          message = {graph_title: graph_title}
+        # graph_title
+        def get_backbone_bandwidth_graph(message)
           request(:get_backbone_bandwidth_graph, Softlayer::Container::Bandwidth::GraphOutputs, message)
         end
 
-        def get_bandwidth_data(start_date_time = nil, end_date_time = nil, type = nil, rollup_seconds = nil)
-          message = {start_date_time: start_date_time, end_date_time: end_date_time, type: type, rollup_seconds: rollup_seconds}
+        # start_date_time
+        # end_date_time
+        # type
+        # rollup_seconds
+        def get_bandwidth_data(message)
           request(:get_bandwidth_data, Array[Softlayer::Metric::Tracking::Object::Data], message)
         end
 
-        def get_bandwidth_graph(start_date_time = nil, end_date_time = nil, graph_type = nil, font_size = nil, graph_width = nil, graph_height = nil, do_not_show_time_zone = nil)
-          message = {start_date_time: start_date_time, end_date_time: end_date_time, graph_type: graph_type, font_size: font_size, graph_width: graph_width, graph_height: graph_height, do_not_show_time_zone: do_not_show_time_zone}
+        # start_date_time
+        # end_date_time
+        # graph_type
+        # font_size
+        # graph_width
+        # graph_height
+        # do_not_show_time_zone
+        def get_bandwidth_graph(message)
           request(:get_bandwidth_graph, Softlayer::Container::Bandwidth::GraphOutputs, message)
         end
 
-        def get_bandwidth_total(start_date_time = nil, end_date_time = nil, direction = nil, type = nil)
-          message = {start_date_time: start_date_time, end_date_time: end_date_time, direction: direction, type: type}
+        # start_date_time
+        # end_date_time
+        # direction
+        # type
+        def get_bandwidth_total(message)
           request(:get_bandwidth_total, BigDecimal, message)
         end
 
-        def get_custom_graph_data(graph_container = nil)
-          message = {graph_container: graph_container}
+        # graph_container
+        def get_custom_graph_data(message)
           request(:get_custom_graph_data, Softlayer::Container::Graph, message)
         end
 
-        def get_details_for_date_range(start_date = nil, end_date = nil, graph_type = nil)
-          message = {start_date: start_date, end_date: end_date, graph_type: graph_type}
+        # start_date
+        # end_date
+        # graph_type
+        def get_details_for_date_range(message)
           request(:get_details_for_date_range, Array[Softlayer::Container::Metric::Tracking::Object::Details], message)
         end
 
-        def get_graph(start_date_time = nil, end_date_time = nil, graph_type = nil)
-          message = {start_date_time: start_date_time, end_date_time: end_date_time, graph_type: graph_type}
+        # start_date_time
+        # end_date_time
+        # graph_type
+        def get_graph(message)
           request(:get_graph, Softlayer::Container::Bandwidth::GraphOutputs, message)
         end
 
@@ -60,13 +76,16 @@ module Softlayer
           request(:get_object, Softlayer::Metric::Tracking::Object)
         end
 
-        def get_summary(graph_type = nil)
-          message = {graph_type: graph_type}
+        # graph_type
+        def get_summary(message)
           request(:get_summary, Softlayer::Container::Metric::Tracking::Object::Summary, message)
         end
 
-        def get_summary_data(start_date_time = nil, end_date_time = nil, valid_types = nil, summary_period = nil)
-          message = {start_date_time: start_date_time, end_date_time: end_date_time, valid_types: valid_types, summary_period: summary_period}
+        # start_date_time
+        # end_date_time
+        # valid_types
+        # summary_period
+        def get_summary_data(message)
           request(:get_summary_data, Array[Softlayer::Metric::Tracking::Object::Data], message)
         end
 

data/lib/softlayer/model/filter.rb

@@ -8,7 +8,7 @@ module Softlayer
 
       def to_header
         {
-          "tns:#{@service_name}ObjectFilter" => @filter
+          "tns:#{@service_name}ObjectFilter" => @filter.to_softlayer_filter
         }
       end
     end

data/lib/softlayer/model.rb

@@ -34,6 +34,7 @@ module Softlayer #:nodoc:
 
       def request(method, return_object, message = {}, headers = {})
         headers.merge! request_headers
+        message = process_message(message)
 
         return Softlayer::Mock.request(service_name, method, return_object, message, headers) if Softlayer.mock?
         parse(Softlayer::Client.new(service_name).call(method, message, headers), return_object, method)
@@ -117,6 +118,13 @@ module Softlayer #:nodoc:
         return nil unless requests.has_key?(klass)
         requests[klass]
       end
+
+      def process_message(message)
+        message.each_pair do |k, v|
+          message[k] = v.to_softlayer if v.respond_to?(:to_softlayer)
+        end
+        message
+      end
     end
 
     def request(method, return_object, message = {})
@@ -133,6 +141,21 @@ module Softlayer #:nodoc:
       self.class.service_name
     end
 
+    def to_softlayer
+      hash = "#{self.class}::Representer".constantize.new(self).to_hash
+      self.instance_variables.each do |var|
+        value = self.instance_variable_get(var)
+        unless value.nil?
+          if value.respond_to?(:to_softlayer)
+            hash[var.to_s.tr('@', '').camelize(:lower)] = value.to_softlayer
+          else
+            hash[var.to_s.tr('@', '').camelize(:lower)] = value
+          end
+        end
+      end
+      hash.camelize_keys!
+    end
+
     def init_headers
       raise Exception.new('You need to set the ID on object') if id.nil?
       {

data/lib/softlayer/monitoring/agent/configuration/template/group/reference.rb

@@ -12,23 +12,23 @@ module Softlayer
               attr_accessor :configuration_template
               attr_accessor :template_group
 
-              def self.create_object(template_object = nil)
-                message = {template_object: template_object}
+              # template_object
+              def self.create_object(message)
                 request(:create_object, Softlayer::Monitoring::Agent::Configuration::Template::Group::Reference, message)
               end
 
-              def self.create_objects(template_objects = nil)
-                message = {template_objects: template_objects}
+              # template_objects
+              def self.create_objects(message)
                 request(:create_objects, Boolean, message)
               end
 
-              def edit_object(template_object = nil)
-                message = {template_object: template_object}
+              # template_object
+              def edit_object(message)
                 request(:edit_object, Boolean, message)
               end
 
-              def self.edit_objects(template_objects = nil)
-                message = {template_objects: template_objects}
+              # template_objects
+              def self.edit_objects(message)
                 request(:edit_objects, Boolean, message)
               end
 

data/lib/softlayer/monitoring/agent/configuration/template/group.rb

@@ -20,8 +20,8 @@ module Softlayer
             attr_accessor :configuration_templates
             attr_accessor :item
 
-            def self.create_object(template_object = nil)
-              message = {template_object: template_object}
+            # template_object
+            def self.create_object(message)
               request(:create_object, Softlayer::Monitoring::Agent::Configuration::Template::Group, message)
             end
 
@@ -29,8 +29,8 @@ module Softlayer
               request(:delete_object, Boolean)
             end
 
-            def edit_object(template_object = nil)
-              message = {template_object: template_object}
+            # template_object
+            def edit_object(message)
               request(:edit_object, Boolean, message)
             end
 
@@ -42,8 +42,8 @@ module Softlayer
               request(:get_all_objects, Array[Softlayer::Monitoring::Agent::Configuration::Template::Group])
             end
 
-            def self.get_configuration_groups(package_id = nil)
-              message = {package_id: package_id}
+            # package_id
+            def self.get_configuration_groups(message)
               request(:get_configuration_groups, Array[Softlayer::Monitoring::Agent::Configuration::Template::Group], message)
             end