diff options
| author | Lorin Hochstein <lorin@isi.edu> | 2011-06-26 20:02:18 -0400 |
|---|---|---|
| committer | Lorin Hochstein <lorin@isi.edu> | 2011-06-26 20:02:18 -0400 |
| commit | 69c475fb9bb6eaa67880bc08f2b2479b84b16113 (patch) | |
| tree | c5eaefa171a93ea61135c0d0c2908b62417270a9 /nova/api | |
| parent | 0f5e7930b48ddd48a803ff5afd25f980df2e31b6 (diff) | |
| parent | 8a8c013cd4513b07e936125a23188e7608f40d58 (diff) | |
Upstream merge
Moved instance type extra specs tests to extensions directory.
Added os- prefix to extra specs API alias.
Pegged pep8 venv version to 0.6.1
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/contrib/flavorextraspecs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/contrib/flavorextraspecs.py b/nova/api/openstack/contrib/flavorextraspecs.py index 8518bf2bd..2d897a1da 100644 --- a/nova/api/openstack/contrib/flavorextraspecs.py +++ b/nova/api/openstack/contrib/flavorextraspecs.py @@ -103,7 +103,7 @@ class Flavorextraspecs(extensions.ExtensionDescriptor): return "FlavorExtraSpecs" def get_alias(self): - return "flavor-extra-specs" + return "os-flavor-extra-specs" def get_description(self): return "Instance type (flavor) extra specs" @@ -118,7 +118,7 @@ class Flavorextraspecs(extensions.ExtensionDescriptor): def get_resources(self): resources = [] res = extensions.ResourceExtension( - 'extra_specs', + 'os-extra_specs', FlavorExtraSpecsController(), parent=dict(member_name='flavor', collection_name='flavors')) |