x/python-ganttclient
Code Issues Proposed changes

add project ids to volumes

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-06-24 04:11:56 +01:00
committed by andy
parent e216588a95
commit 61fb743f5f
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/endpoint/cloud.py
View File

@@ -279,7 +279,8 @@ class CloudController(object):
# TODO(vish): refactor this to create the volume object here and tell storage to create it # TODO(vish): refactor this to create the volume object here and tell storage to create it
res = rpc.call(FLAGS.storage_topic, {"method": "create_volume", res = rpc.call(FLAGS.storage_topic, {"method": "create_volume",
"args" : {"size": size, "args" : {"size": size,
"user_id": context.user.id}}) "user_id": context.user.id,
"project_id": context.project.id}})
def _format_result(result): def _format_result(result):
volume = self._get_volume(context, result['result']) volume = self._get_volume(context, result['result'])
return {'volumeSet': [self.format_volume(context, volume)]} return {'volumeSet': [self.format_volume(context, volume)]}

34
nova/tests/storage_unittest.py
View File

@@ -1,12 +1,12 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4 # vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright [2010] [Anso Labs, LLC] # Copyright [2010] [Anso Labs, LLC]
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,15 +14,6 @@
# limitations under the License. # limitations under the License.
import logging import logging
import StringIO
import time
import unittest
from xml.etree import ElementTree
from nova import vendor
import mox
from tornado import ioloop
from twisted.internet import defer
from nova import exception from nova import exception
from nova import flags from nova import flags
@@ -50,7 +41,8 @@ class StorageTestCase(test.TrialTestCase):
def test_run_create_volume(self): def test_run_create_volume(self):
vol_size = '0' vol_size = '0'
user_id = 'fake' user_id = 'fake'
volume_id = self.mystorage.create_volume(vol_size, user_id) project_id = 'fake'
volume_id = self.mystorage.create_volume(vol_size, user_id, project_id)
# TODO(termie): get_volume returns differently than create_volume # TODO(termie): get_volume returns differently than create_volume
self.assertEqual(volume_id, self.assertEqual(volume_id,
storage.get_volume(volume_id)['volume_id']) storage.get_volume(volume_id)['volume_id'])
@@ -59,22 +51,24 @@ class StorageTestCase(test.TrialTestCase):
self.assertRaises(exception.Error, self.assertRaises(exception.Error,
storage.get_volume, storage.get_volume,
volume_id) volume_id)
def test_too_big_volume(self): def test_too_big_volume(self):
vol_size = '1001' vol_size = '1001'
user_id = 'fake' user_id = 'fake'
project_id = 'fake'
self.assertRaises(TypeError, self.assertRaises(TypeError,
self.mystorage.create_volume, self.mystorage.create_volume,
vol_size, user_id) vol_size, user_id, project_id)
def test_run_attach_detach_volume(self): def test_run_attach_detach_volume(self):
# Create one volume and one node to test with # Create one volume and one node to test with
instance_id = "storage-test" instance_id = "storage-test"
vol_size = "5" vol_size = "5"
user_id = "fake" user_id = "fake"
project_id = 'fake'
mountpoint = "/dev/sdf" mountpoint = "/dev/sdf"
volume_id = self.mystorage.create_volume(vol_size, user_id) volume_id = self.mystorage.create_volume(vol_size, user_id, project_id)
volume_obj = storage.get_volume(volume_id) volume_obj = storage.get_volume(volume_id)
volume_obj.start_attach(instance_id, mountpoint) volume_obj.start_attach(instance_id, mountpoint)
rv = yield self.mynode.attach_volume(volume_id, rv = yield self.mynode.attach_volume(volume_id,
@@ -84,7 +78,7 @@ class StorageTestCase(test.TrialTestCase):
self.assertEqual(volume_obj['attachStatus'], "attached") self.assertEqual(volume_obj['attachStatus'], "attached")
self.assertEqual(volume_obj['instance_id'], instance_id) self.assertEqual(volume_obj['instance_id'], instance_id)
self.assertEqual(volume_obj['mountpoint'], mountpoint) self.assertEqual(volume_obj['mountpoint'], mountpoint)
self.assertRaises(exception.Error, self.assertRaises(exception.Error,
self.mystorage.delete_volume, self.mystorage.delete_volume,
volume_id) volume_id)
@@ -92,12 +86,12 @@ class StorageTestCase(test.TrialTestCase):
rv = yield self.mystorage.detach_volume(volume_id) rv = yield self.mystorage.detach_volume(volume_id)
volume_obj = storage.get_volume(volume_id) volume_obj = storage.get_volume(volume_id)
self.assertEqual(volume_obj['status'], "available") self.assertEqual(volume_obj['status'], "available")
rv = self.mystorage.delete_volume(volume_id) rv = self.mystorage.delete_volume(volume_id)
self.assertRaises(exception.Error, self.assertRaises(exception.Error,
storage.get_volume, storage.get_volume,
volume_id) volume_id)
def test_multi_node(self): def test_multi_node(self):
# TODO(termie): Figure out how to test with two nodes, # TODO(termie): Figure out how to test with two nodes,
# each of them having a different FLAG for storage_node # each of them having a different FLAG for storage_node