timestamp consistency for insert_tenant

Change-Id: I7765b38061a91915e1195afbeb8c6efdef0de966

artifice/api/web.py

@@ -105,8 +105,9 @@ def keystone(func):
 
 
 def collect_usage(tenant, db, session, resp, end):
+    timestamp = datetime.now()
     db.insert_tenant(tenant.conn['id'], tenant.conn['name'],
-                    tenant.conn['description'])
+                    tenant.conn['description'], timestamp)
     session.begin(subtransactions=True)
     start = session.query(func.max(UsageEntry.end).label('end')).\
         filter(UsageEntry.tenant_id == tenant.conn['id']).first().end
@@ -114,7 +115,6 @@ def collect_usage(tenant, db, session, resp, end):
         start = datetime.strptime(dawn_of_time, iso_date)
 
     usage = tenant.usage(start, end)
-    timestamp = datetime.now()
 
     # enter all resources into the db
     db.enter(usage.values(), start, end, timestamp)

artifice/database.py

@@ -12,7 +12,7 @@ class Database(object):
         # engine = create_engine(os.environ["DATABASE_URL"])
         # Base.metadata.create_all(engine)
 
-    def insert_tenant(self, tenant_id, tenant_name, metadata):
+    def insert_tenant(self, tenant_id, tenant_name, metadata, timestamp):
         """If a tenant exists does nothing,
            and if it doesn't, creates and inserts it."""
         #  Have we seen this tenant before?
@@ -22,7 +22,7 @@ class Database(object):
             self.session.add(Tenant(id=tenant_id,
                                     info=metadata,
                                     name=tenant_name,
-                                    created=datetime.now()
+                                    created=timestamp
                                     ))
             self.session.flush()
 

tests/test_database_module.py

@@ -12,16 +12,17 @@ class TestDatabaseModule(test_interface.TestInterface):
         """Tests adding all the data to the database."""
 
         usage = helpers.get_usage()
+        timestamp = datetime.now()
 
         db = database.Database(self.session)
         db.insert_tenant(TENANT_ID,
-                         "demo", "")
+                         "demo", "", timestamp)
 
         # patch to mock out the novaclient call
         with mock.patch('artifice.helpers.flavor_name') as flavor_name:
             flavor_name.side_effect = lambda x: x
 
-            db.enter(usage.values(), self.start, self.end, datetime.now())
+            db.enter(usage.values(), self.start, self.end, timestamp)
 
             count = 0
             for val in usage.values():