summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-31 15:57:17 +0000
committerGerrit Code Review <review@openstack.org>2013-07-31 15:57:17 +0000
commit378f9030531462d2afabd4d39fca862a3a2bbbd8 (patch)
tree0bb8c6732b49d73d69b4e1a173da0bd760257b3e
parent74043bbac33990f4cf9409f1ec51ca7b287fc69f (diff)
parentc51bfc29752ef1d4080149f0ed8cce5f3cb22129 (diff)
downloadceilometer-2013.1.3.tar.gz
Merge "Fix return error when resource can't be found" into stable/grizzly2013.1.3
-rw-r--r--ceilometer/api/controllers/v2.py10
-rw-r--r--tests/api/v2/test_list_resources.py50
2 files changed, 57 insertions, 3 deletions
diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py
index 89eb2a99..8f98feb3 100644
--- a/ceilometer/api/controllers/v2.py
+++ b/ceilometer/api/controllers/v2.py
@@ -500,9 +500,13 @@ class ResourcesController(rest.RestController):
:param resource_id: The UUID of the resource.
"""
- r = list(pecan.request.storage_conn.get_resources(
- resource=resource_id))[0]
- return Resource(**r)
+ resources = list(pecan.request.storage_conn.get_resources(
+ resource=resource_id))
+ if not resources:
+ raise wsme.exc.InvalidInput("resource_id",
+ resource_id,
+ _("Unknown resource"))
+ return Resource(**resources[0])
@wsme_pecan.wsexpose([Resource], [Query])
def get_all(self, q=[]):
diff --git a/tests/api/v2/test_list_resources.py b/tests/api/v2/test_list_resources.py
index ab9c1359..88337baf 100644
--- a/tests/api/v2/test_list_resources.py
+++ b/tests/api/v2/test_list_resources.py
@@ -189,6 +189,56 @@ class TestListResources(FunctionalTest):
ids = [r['resource_id'] for r in data]
self.assertEquals(['resource-id'], ids)
+ def test_with_invalid_resource_id(self):
+ counter1 = counter.Counter(
+ 'instance',
+ 'cumulative',
+ '',
+ 1,
+ 'user-id',
+ 'project-id',
+ 'resource-id-1',
+ timestamp=datetime.datetime(2012, 7, 2, 10, 40),
+ resource_metadata={'display_name': 'test-server',
+ 'tag': 'self.counter',
+ }
+ )
+ msg = rpc.meter_message_from_counter(
+ counter1,
+ cfg.CONF.publisher_rpc.metering_secret,
+ 'test_list_resources',
+ )
+ self.conn.record_metering_data(msg)
+
+ counter2 = counter.Counter(
+ 'instance',
+ 'cumulative',
+ '',
+ 1,
+ 'user-id2',
+ 'project-id',
+ 'resource-id-2',
+ timestamp=datetime.datetime(2012, 7, 2, 10, 41),
+ resource_metadata={'display_name': 'test-server',
+ 'tag': 'self.counter2',
+ }
+ )
+ msg2 = rpc.meter_message_from_counter(
+ counter2,
+ cfg.CONF.publisher_rpc.metering_secret,
+ 'test_list_resources',
+ )
+ self.conn.record_metering_data(msg2)
+
+ resp1 = self.get_json('/resources/resource-id-1')
+ self.assertEquals(resp1["resource_id"], "resource-id-1")
+
+ resp2 = self.get_json('/resources/resource-id-2')
+ self.assertEquals(resp2["resource_id"], "resource-id-2")
+
+ resp3 = self.get_json('/resources/resource-id-3', expect_errors=True)
+ self.assertEquals(resp3.status_code, 400)
+
def test_with_user(self):
counter1 = counter.Counter(
'instance',