summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2010-12-20 14:21:01 -0600
committerJosh Kearney <josh.kearney@rackspace.com>2010-12-20 14:21:01 -0600
commitf53532bf17d0fac1cc4a1f51f6c12e2ae12d0d74 (patch)
tree1e93cdd12c8ed79c275cda4edff093e497f749b4
parent2eafa204703785f314226eeebb31a840d3dd502f (diff)
downloadnova-f53532bf17d0fac1cc4a1f51f6c12e2ae12d0d74.tar.gz
nova-f53532bf17d0fac1cc4a1f51f6c12e2ae12d0d74.tar.xz
nova-f53532bf17d0fac1cc4a1f51f6c12e2ae12d0d74.zip
Make column names more generic
-rw-r--r--nova/db/sqlalchemy/models.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 6eac1b873..96d981571 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -232,15 +232,13 @@ class InstanceDiagnostics(BASE, NovaBase):
id = Column(Integer, primary_key=True)
instance_id = Column(Integer, ForeignKey('instances.id'))
- vbd_xvda_read = Column(Float)
- vbd_xvda_write = Column(Float)
- vbd_xvdb_read = Column(Float)
- vbd_xvdb_write = Column(Float)
- memory = Column(Float)
- memory_internal_free = Column(Float)
- cpu0 = Column(Float)
- vif_0_tx = Column(Float)
- vif_0_rx = Column(Float)
+ memory_available = Column(Float)
+ memory_free = Column(Float)
+ cpu_load = Column(Float)
+ disk_read = Column(Float)
+ disk_write = Column(Float)
+ net_tx = Column(Float)
+ net_rx = Column(Float)
class InstanceActions(BASE, NovaBase):