]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Fall back on empty path if prefix is missing
authorarmando-migliaccio <armamig@gmail.com>
Thu, 2 Jul 2015 02:46:16 +0000 (19:46 -0700)
committerarmando-migliaccio <armamig@gmail.com>
Fri, 3 Jul 2015 00:05:27 +0000 (17:05 -0700)
A missing entry causes a KeyError that leads the server to blow up during
startup. We can fallback on an empty path (like some services do), in case
the prefix is not specified.

Furthermore, we can be declarative with this property, the same way we are
with properties like aliases, bulk support, etc.

Change-Id: I58a9b90a39d434f4808264aeb6f9ee5aceff7fbd

neutron/api/v2/resource_helper.py

index 9d952901b270af76b9b89d28a63c762adbc047b1..61090638b910d567199733e9210bfae0b4cbf89a 100644 (file)
@@ -82,10 +82,12 @@ def build_resource_info(plural_mappings, resource_map, which_service,
             allow_bulk=allow_bulk,
             allow_pagination=cfg.CONF.allow_pagination,
             allow_sorting=cfg.CONF.allow_sorting)
+        path_prefix = getattr(plugin, "path_prefix",
+                              constants.COMMON_PREFIXES.get(which_service, ""))
         resource = extensions.ResourceExtension(
             collection_name,
             controller,
-            path_prefix=constants.COMMON_PREFIXES[which_service],
+            path_prefix=path_prefix,
             member_actions=member_actions,
             attr_map=params)
         resources.append(resource)