Merge pull request fog#2400 from maestrodev/aws-dns-status

[aws|dns] Don't set mock changes to INSYNC immediately, only after some timeout
rupakg · Nov 19, 2013 · e0835fd · e0835fd
2 parents 6d1106f + 747c7f2
commit e0835fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/fog/aws/requests/dns/change_resource_record_sets.rb b/lib/fog/aws/requests/dns/change_resource_record_sets.rb
@@ -180,7 +180,7 @@ def change_resource_record_sets(zone_id, change_batch, options = {})
             if errors.empty?
               change = {
                 :id => change_id,
-                :status => 'INSYNC',
+                :status => 'PENDING',
                 :submitted_at => Time.now.utc.iso8601
               }
               self.data[:changes][change[:id]] = change

diff --git a/lib/fog/aws/requests/dns/create_hosted_zone.rb b/lib/fog/aws/requests/dns/create_hosted_zone.rb
@@ -82,7 +82,7 @@ def create_hosted_zone(name, options = {})
             }
             change = {
               :id => Fog::AWS::Mock.change_id,
-              :status => 'INSYNC',
+              :status => 'PENDING',
               :submitted_at => Time.now.utc.iso8601
             }
             self.data[:changes][change[:id]] = change

diff --git a/lib/fog/aws/requests/dns/get_change.rb b/lib/fog/aws/requests/dns/get_change.rb
@@ -43,9 +43,11 @@ def get_change(change_id)
 
           if change
             response.status = 200
+            submitted_at = Time.parse(change[:submitted_at])
             response.body = {
               'Id' => change[:id],
-              'Status' => 'INSYNC', # TODO do some logic here
+              # set as insync after some time
+              'Status' => (submitted_at + (Fog.timeout/4).to_i) < Time.now ? 'INSYNC' : change[:status],
               'SubmittedAt' => change[:submitted_at]
             }
             response