various fixes to make usage collection work

Change-Id: I037bd6d4dfa481ec58314d396ded2307e93ec614

artifice/api/web.py

@@ -102,11 +102,11 @@ def keystone(func):
 
 def collect_usage(tenant, db, session, resp, end):
     timestamp = datetime.now()
-    db.insert_tenant(tenant.conn['id'], tenant.conn['name'],
+    db.insert_tenant(tenant.id, tenant.name,
-                    tenant.conn['description'], timestamp)
+                    tenant.description, timestamp)
     session.begin(subtransactions=True)
     start = session.query(func.max(UsageEntry.end).label('end')).\
-        filter(UsageEntry.tenant_id == tenant.conn['id']).first().end
+        filter(UsageEntry.tenant_id == tenant.id).first().end
     if not start:
         start = datetime.strptime(dawn_of_time, iso_date)
 
@@ -118,7 +118,7 @@ def collect_usage(tenant, db, session, resp, end):
     try:
         session.commit()
         resp["tenants"].append(
-            {"id": tenant.conn['id'],
+            {"id": tenant.id,
              "updated": True,
              "start": start.strftime(iso_time),
              "end": end.strftime(iso_time)
@@ -127,7 +127,7 @@ def collect_usage(tenant, db, session, resp, end):
     except sqlalchemy.exc.IntegrityError:
         # this is fine.
         resp["tenants"].append(
-            {"id": tenant.conn['id'],
+            {"id": tenant.id,
              "updated": False,
              "error": "Integrity error",
              "start": start.strftime(iso_time),
@@ -146,24 +146,30 @@ def run_usage_collection():
 
     The volume will be parsed from JSON as a Decimal object.
     """
+    try:
 
-    session = Session()
+        session = Session()
-    
+        
-    artifice = interface.Artifice()
+        artifice = interface.Artifice()
-    db = database.Database(session)
+        db = database.Database(session)
 
-    tenants = artifice.tenants
+        tenants = artifice.tenants
 
-    end = datetime.now().\
+        end = datetime.now().\
-        replace(minute=0, second=0, microsecond=0)
+            replace(minute=0, second=0, microsecond=0)
 
-    resp = {"tenants": [], "errors": 0}
+        resp = {"tenants": [], "errors": 0}
 
-    for tenant in tenants:
+        for tenant in tenants:
-        collect_usage(tenant, db, session, resp, end)
+            collect_usage(tenant, db, session, resp, end)
 
-    session.close()
+        session.close()
-    return json.dumps(resp)
+        return json.dumps(resp)
+
+    except Exception as e:
+        print 'Exception escaped!', type(e), e
+        import traceback
+        traceback.print_exc()
 
 
 def generate_sales_order(tenant, session, end, rates):

artifice/database.py

@@ -53,6 +53,7 @@ class Database(object):
                                        end=end,
                                        created=timestamp
                                        )
+                    print entry
                     self.session.add(entry)
                     self.session.flush()
             except TransformerValidationError:

artifice/helpers.py

@@ -1,12 +1,19 @@
 from novaclient.v1_1 import client
 import config
 
+cache = {}
 
 def flavor_name(f_id):
-    nova = client.Client(
+    f_id = int(f_id)
-        config.auth['username'],
+
-        config.auth['password'],
+    if f_id not in cache:
-        config.auth['default_tenant'],
+        nova = client.Client(
-        config.auth['end_point'],
+            config.auth['username'],
-        service_type="compute")
+            config.auth['password'],
-    return nova.flavors.get(f_id).name
+            config.auth['default_tenant'],
+            config.auth['end_point'],
+            service_type="compute",
+            insecure=config.auth['insecure'])
+
+        cache[f_id] = nova.flavors.get(f_id).name
+    return cache[f_id]

artifice/interface.py

@@ -76,20 +76,15 @@ class Tenant(object):
         self._meters = set()
         self._resources = None
 
-    def __getitem__(self, item):
+    @property
-
+    def id(self):
-        try:
+        return self.tenant.id
-            return getattr(self.tenant, item)
+    @property
-        except AttributeError:
+    def name(self):
-            try:
+        return self.tenant.name
-                return self.tenant[item]
+    @property
-            except KeyError:
+    def description(self):
-                raise KeyError("No such key '%s' in tenant" % item)
+        return self.tenant.description
-
-    def __getattr__(self, attr):
-        if attr not in self.tenant:
-            return object.__getattribute__(self, attr)
-        return self.tenant[attr]
 
     def resources(self, start, end):
         if not self._resources:

client/client.py

@@ -1,5 +1,6 @@
 import requests
 from requests.exceptions import ConnectionError
+import json
 
 
 class Client(object):
@@ -9,20 +10,20 @@ class Client(object):
         self.auth_token = kwargs.get('token')
 
     def usage(self, tenants):
-        url = self.endpoint + "usage"
+        url = self.endpoint + "collect_usage"
         data = {"tenants": tenants}
         try:
             response = requests.post(url,
                                      headers={"Content-Type":
                                               "application/json",
                                               "token": self.auth_token},
-                                     data=data)
+                                     data=json.dumps(data))
             if response.status_code != 200:
                 raise AttributeError("Usage cycle failed: " + response.text +
                                      "  code: " + str(response.status_code))
 
-        except ConnectionError:
+        except ConnectionError as e:
-            pass
+            print e
 
     def sales_order(self, tenants):
         url = self.endpoint + "sales_order"
@@ -37,5 +38,5 @@ class Client(object):
                 raise AttributeError("Sales order cycle failed: " +
                                      response.text + "  code: " +
                                      str(response.status_code))
-        except ConnectionError:
+        except ConnectionError as e:
-            pass
+            print e

client/shell.py

@@ -62,7 +62,7 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
-    conf = {'api': {'endpoint': 'http://0.0.0.0/',
+    conf = {'api': {'endpoint': 'http://0.0.0.0:8000/',
                     'token': 'sah324sdf5wad4dh839uhjuUH'}}
 
     # try:

scripts/initdb.py

@@ -1,25 +0,0 @@
-import sys, os
-
-loc = None
-try:
-    loc, fn = os.path.split(__file__)
-except NameError:
-    loc = os.getcwd()
-
-
-sys.path.insert(0, os.path.abspath(os.path.join(loc +"/../artifice")))
-
-from models import usage, resources, tenants, Session, Base
-# string = 'postgresql://%(username)s:%(password)s@%(host)s:%(port)s/%(database)s'
-# conn_string = string % {'username':'aurynn', 'host':'localhost', 'port':5433, 'password':'aurynn', 'database':'artifice'}
-
-from sqlalchemy import MetaData, create_engine
-
-import os
-
-engine = create_engine( os.environ["DATABASE_URL"] )
-Session.configure(bind=engine)
-
-s = Session()
-
-Base.metadata.create_all(engine)

tests/test_api.py

@@ -30,7 +30,11 @@ class TestApi(test_interface.TestInterface):
             for tenant in constants.TENANTS:
                 t = mock.Mock(spec=interface.Tenant)
                 t.usage.return_value = usage
-                t.conn = tenant
+                t.conn = mock.Mock()
+                t.tenant = tenant
+                t.id = tenant['id']
+                t.name = tenant['name']
+                t.description = tenant['description']
                 tenants.append(t)
 
             artifice = mock.Mock(spec=interface.Artifice)