x/python-ganttclient
Code Issues Proposed changes

move volume code into datalayer and cleanup

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-08-19 13:58:43 -07:00
parent 343090dc36
commit 959f78889b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nova/models.py
View File

@@ -231,7 +231,6 @@ class Instance(Base, NovaBase):
class Volume(Base, NovaBase):
__tablename__ = 'volumes'
id = Column(Integer, primary_key=True)
volume_id = Column(String(255))
user_id = Column(String(255)) #, ForeignKey('users.id'), nullable=False)
project_id = Column(String(255)) #, ForeignKey('projects.id'))

11
nova/tests/volume_unittest.py
View File

@@ -21,6 +21,7 @@ import logging
from twisted.internet import defer
from nova import exception
from nova import db
from nova import flags
from nova import models
from nova import test
@@ -89,7 +90,7 @@ class VolumeTestCase(test.TrialTestCase):
self.assertFailure(self.volume.create_volume(vol_size,
user_id,
project_id),
volume_service.NoMoreBlades)
db.sqlalchemy.api.NoMoreBlades)
for id in vols:
yield self.volume.delete_volume(id)
@@ -102,23 +103,21 @@ class VolumeTestCase(test.TrialTestCase):
project_id = 'fake'
mountpoint = "/dev/sdf"
volume_id = yield self.volume.create_volume(vol_size, user_id, project_id)
vol = models.Volume.find(volume_id)
self.volume.start_attach(volume_id, instance_id, mountpoint)
if FLAGS.fake_tests:
self.volume.finish_attach(volume_id)
db.volume_attached(None, volume_id, instance_id, mountpoint)
else:
rv = yield self.compute.attach_volume(instance_id,
volume_id,
mountpoint)
vol = db.volume_get(None, volume_id)
self.assertEqual(vol.status, "in-use")
self.assertEqual(vol.attach_status, "attached")
self.assertEqual(vol.instance_id, instance_id)
self.assertEqual(vol.mountpoint, mountpoint)
self.assertFailure(self.volume.delete_volume(volume_id), exception.Error)
self.volume.start_detach(volume_id)
if FLAGS.fake_tests:
self.volume.finish_detach(volume_id)
db.volume_detached(None, volume_id)
else:
rv = yield self.volume.detach_volume(instance_id,
volume_id)