Merge "Raising error if invalid attribute passed in."

diff --cc quantum/api/v2/base.py
Simple merge

diff --cc quantum/tests/unit/test_api_v2.py
index f5510058bc07916708f4b38ad56b2259322ff9f5,b1da94cf137224f3c5caec9c73d963a9c81f3edd..0256fe3b86e89a3d47924fa9795a797e3836e71e
--- 1/quantum/tests/unit/test_api_v2.py
--- 2/quantum/tests/unit/test_api_v2.py
+++ b/quantum/tests/unit/test_api_v2.py
@@@ -1127,8 -720,9 +1149,10 @@@ class SubresourceTest(unittest.TestCase
          self._plugin_patcher.stop()
          self.api = None
          self.plugin = None
 +        router.SUB_RESOURCES = {}
          cfg.CONF.reset()
+         # Restore the global RESOURCE_ATTRIBUTE_MAP
+         attributes.RESOURCE_ATTRIBUTE_MAP = self.saved_attr_map
  
      def test_index_sub_resource(self):
          instance = self.plugin.return_value

diff --cc quantum/tests/unit/test_db_plugin.py
Simple merge