Merge pull request #14645 from durandom/ansible_event_catcher

ansible event catcher: fetch activity_stream by event id
(cherry picked from commit 1589a3c)

https://bugzilla.redhat.com/show_bug.cgi?id=1444516

app/models/manageiq/providers/ansible_tower/shared/automation_manager/event_catcher/stream.rb

@@ -15,7 +15,7 @@ def poll
             ansible.api.activity_stream.all(filter).each do |activity|
               throw :stop_polling if @stop_polling
               yield activity.to_h
-              @last_activity = activity
+              self.last_activity = activity
             end
             sleep @poll_sleep
           end
@@ -29,11 +29,26 @@ def poll
 
   private
 
+  def last_activity=(activity)
+    @last_activity = activity
+  end
+
+  def last_activity
+    @last_activity ||= begin
+      @ems.with_provider_connection do |ansible|
+        ansible.api.activity_stream.all(:order_by => '-id').first
+      end
+    end
+  end
+
   def filter
-    timestamp = @last_activity ? Time.zone.parse(@last_activity.timestamp.to_s) : 1.minute.ago
-    {
-      :order_by      => 'timestamp',
-      :timestamp__gt => timestamp.to_s(:db)
-    }
+    if last_activity
+      {
+        :order_by => 'id',
+        :id__gt   => last_activity.id
+      }
+    else
+      { :order_by => 'id'}
+    end
   end
 end

spec/support/ansible_shared/automation_manager/event_catcher/stream.rb

@@ -17,67 +17,17 @@
 
   context "#poll" do
     it "yields valid events" do
-      subject.instance_variable_set(:@last_activity, OpenStruct.new(:timestamp => '2016-01-01 01:00:00'))
-      subject.instance_variable_set(:@poll_sleep, 0)
-      expected_event = {
-        "id"                 => 1,
-        "type"               => "activity_stream",
-        "url"                => "/api/v1/activity_stream/1/",
-        "related"            => {
-          "user" => [
-            "/api/v1/users/1/"
-          ]
-        },
-        "summary_fields"     => {
-          "user" => [
-            {
-              "username"   => "admin",
-              "first_name" => "",
-              "last_name"  => "",
-              "id"         => 1
-            }
-          ]
-        },
-        "timestamp"          => "2016-08-02T17:56:37.212874Z",
-        "operation"          => "create",
-        "changes"            => {
-          "username"     => "admin",
-          "first_name"   => "",
-          "last_name"    => "",
-          "is_active"    => true,
-          "id"           => 1,
-          "is_superuser" => true,
-          "is_staff"     => true,
-          "password"     => "hidden",
-          "email"        => "admin@example.com",
-          "date_joined"  => "2016-08-02 17:56:37.162225+00:00"
-        },
-        "object1"            => "user",
-        "object2"            => "",
-        "object_association" => ""
-      }
-
       VCR.use_cassette(cassette_file) do
+        last_activity = subject.send(:last_activity)
+        # do something on tower that creates an activity in activity_stream
+        provider.connect.api.credentials.create!(:name => 'test_stream', :user => 1)
+        polled_event = nil
         subject.poll do |event|
-          polled_event = event
-          expect(polled_event.to_h).to eq(expected_event)
+          expect(event['id']).to eq(last_activity.id + 1)
           subject.stop
+          polled_event = event
         end
-      end
-    end
-  end
-
-  context ".filter" do
-    it "converts timestamp to correct timeformat" do
-      # It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]
-      timestamps = {
-        '2016-01-01 01:00:00'                  => '2016-01-01 01:00:00',
-        '2017-03-10 19%3A31%3A26'              => '2017-03-10 00:00:00',
-        Time.zone.parse('1975-12-31 01:01:01') => '1975-12-31 01:01:01',
-      }
-      timestamps.each do |input, converted|
-        subject.instance_variable_set(:@last_activity, OpenStruct.new(:timestamp => input))
-        expect(subject.send(:filter)[:timestamp__gt]).to eq(converted)
+        expect(subject.send(:last_activity).id).to eq(polled_event['id'])
       end
     end
   end