From 01f7b0aa8de984baa27be50171526696aac48c0c Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Wed, 18 May 2011 14:46:39 -0500
Subject: [PATCH] Adding FlagNotSet exception

---
 nova/api/openstack/zones.py            |  3 ++-
 nova/exception.py                      |  4 ++++
 nova/tests/api/openstack/test_zones.py | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py
index 70653dc0e06e..145b24347f9e 100644
--- a/nova/api/openstack/zones.py
+++ b/nova/api/openstack/zones.py
@@ -18,6 +18,7 @@ import urlparse
 
 from nova import crypto
 from nova import db
+from nova import exception
 from nova import flags
 from nova import log as logging
 from nova.api.openstack import common
@@ -54,7 +55,7 @@ def _scrub_zone(zone):
 def check_encryption_key(func):
     def wrapped(*args, **kwargs):
         if not FLAGS.build_plan_encryption_key:
-            raise exception.Error(_("--build_plan_encryption_key not set"))
+            raise exception.FlagNotSet(flag='build_plan_encryption_key')
         return func(*args, **kwargs)
     return wrapped
 
diff --git a/nova/exception.py b/nova/exception.py
index cf606945407b..56c20d1111a0 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -255,6 +255,10 @@ class NotFound(NovaException):
         super(NotFound, self).__init__(**kwargs)
 
 
+class FlagNotSet(NotFound):
+    message = _("Required flag %(flag)s not set.")
+
+
 class InstanceNotFound(NotFound):
     message = _("Instance %(instance_id)s could not be found.")
 
diff --git a/nova/tests/api/openstack/test_zones.py b/nova/tests/api/openstack/test_zones.py
index b42b3e7d8bcc..62a763c6f8b5 100644
--- a/nova/tests/api/openstack/test_zones.py
+++ b/nova/tests/api/openstack/test_zones.py
@@ -21,6 +21,7 @@ import json
 import nova.db
 from nova import context
 from nova import crypto
+from nova import exception
 from nova import flags
 from nova import test
 from nova.api.openstack import zones
@@ -120,6 +121,17 @@ class ZonesTest(test.TestCase):
         FLAGS.zone_capabilities = self.old_zone_capabilities
         super(ZonesTest, self).tearDown()
 
+    def test_check_encryption_key(self):
+        @zones.check_encryption_key
+        def test_func():
+            return 42
+
+        self.assertRaises(exception.FlagNotSet, test_func)
+
+        FLAGS.build_plan_encryption_key = "something"
+        ret = test_func()
+        self.assertEqual(ret, 42)
+
     def test_get_zone_list_scheduler(self):
         self.stubs.Set(api, '_call_scheduler', zone_get_all_scheduler)
         req = webob.Request.blank('/v1.0/zones')