Merge pull request #187 from josejulio/jira/HAWKULAR-1154

HAWKULAR-1154 - Supports [Update Collection Intervals] command.

Author: rubenvp8510

lib/hawkular/operations/operations_api.rb

@@ -308,6 +308,22 @@ def export_jdr(resource_path, &callback)
       invoke_specific_operation({ resourcePath: resource_path }, 'ExportJdr', &callback)
     end
 
+    # Updates the collection intervals.
+    #
+    # @param [Hash] hash Arguments for update collection intervals
+    # @option hash {resourcePath} a resource managed by the target agent
+    # @option hash {metricTypes} A map with key=MetricTypeId, value=interval (seconds).
+    # MetricTypeId must be of form MetricTypeSet~MetricTypeName
+    # @option hash {availTypes} A map with key=AvailTypeId, value=interval (seconds).
+    # AvailTypeId must be of form AvailTypeSet~AvailTypeName
+    #
+    # @param callback [Block] callback that is run after the operation is done
+    def update_collection_intervals(hash, &callback)
+      required = [:resourcePath, :metricTypes, :availTypes]
+      check_pre_conditions hash, required, &callback
+      invoke_specific_operation(hash, 'UpdateCollectionIntervals', &callback)
+    end
+
     private
 
     def invoke_operation_helper(operation_payload, operation_name = nil, binary_content = nil, &callback)

spec/integration/operations_spec.rb

@@ -555,6 +555,36 @@ module Hawkular::Operations::RSpec
           expect(actual_data['message']).to start_with('Performed [Export JDR] on')
           expect(actual_data['fileName']).to start_with('jdr_')
         end
+
+        it 'Update collection intervals should be performed and eventually respond with success' do
+          wf_server_resource_id = 'Local~~'
+          wf_agent_id = 'Local~%2Fsubsystem%3Dhawkular-wildfly-agent'
+          path = CanonicalPath.new(tenant_id: @tenant_id,
+                                   feed_id: @feed_id,
+                                   resource_ids: [wf_server_resource_id, wf_agent_id])
+
+          hash = {
+            resourcePath: path.to_s,
+            metricTypes: { 'WildFly Memory Metrics~Heap Max' => 77, 'Unknown~Metric' => 666 },
+            availTypes: { 'Server Availability~Server Availability' => 77, 'Unknown~Avail' => 666 }
+          }
+
+          actual_data = {}
+          client.update_collection_intervals(hash) do |on|
+            on.success do |data|
+              actual_data[:data] = data
+            end
+            on.failure do |error|
+              actual_data[:data] = error
+              puts 'error callback was called, reason: ' + error.to_s unless @agent_immutable
+            end
+          end
+          actual_data = wait_for actual_data
+          expect(actual_data['status']).to eq('OK') unless @agent_immutable
+          expect(
+            actual_data['message']).to start_with('Performed [Update Collection Intervals] on') unless @agent_immutable
+          expect(actual_data).to include('Command not allowed because the agent is immutable') if @agent_immutable
+        end
       end
     end
   end

spec/vcr_cassettes/Operation/NonSecure/Operation/Update_collection_intervals_should_be_performed_and_eventually_respond_with_success.json

@@ -0,0 +1,23 @@
+[
+  [
+    {
+      "operation": "read",
+      "type": "text",
+      "data": "WelcomeResponse={\"sessionId\":\"xlrBtN7CfOPEFbAFsCzgn3p7wq2Ykf7OEFqPmP-F\"}"
+    },
+    {
+      "operation": "write",
+      "data": "UpdateCollectionIntervalsRequest={\"resourcePath\":\"/t;<%= tenant_id %>/f;<%= feed_id %>/r;Local~~/r;Local~%2Fsubsystem%3D<%= tenant_id %>-wildfly-agent\",\"metricTypes\":{\"WildFly Memory Metrics~Heap Max\":77,\"Unknown~Metric\":666},\"availTypes\":{\"Server Availability~Server Availability\":77,\"Unknown~Avail\":666},\"authentication\":{\"username\":\"jdoe\",\"password\":\"password\"}}"
+    },
+    {
+      "operation": "read",
+      "type": "text",
+      "data": "GenericSuccessResponse={\"message\":\"The request has been forwarded to feed [<%= feed_id %>] (MessageId=ID:cdfef562-f793-11e6-9448-dbddd5ca48d1)\"}"
+    },
+    {
+      "operation": "read",
+      "type": "text",
+      "data": "UpdateCollectionIntervalsResponse={\"resourcePath\":\"/t;<%= tenant_id %>/f;<%= feed_id %>/r;Local~~/r;Local~%2Fsubsystem%3D<%= tenant_id %>-wildfly-agent\",\"destinationSessionId\":\"xlrBtN7CfOPEFbAFsCzgn3p7wq2Ykf7OEFqPmP-F\",\"status\":\"OK\",\"message\":\"Performed [Update Collection Intervals] on a [DMR Nodes] given by Inventory path [/t;<%= tenant_id %>/f;<%= feed_id %>/r;Local~~/r;Local~%2Fsubsystem%3D<%= tenant_id %>-wildfly-agent]\"}"
+    }
+  ]
+]