summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-01-06 04:55:16 -0400
committerSandy Walsh <sandy.walsh@rackspace.com>2011-01-06 04:55:16 -0400
commit457e19826cfdb7f8f324180e42d8df79da48cfc6 (patch)
treeb8ed7b9c86eb4fee6694507dad493d1a6eec8b95 /nova/api
parent114577d4f4ed1ca173dadf47d4bf3a5a05c449a2 (diff)
downloadnova-457e19826cfdb7f8f324180e42d8df79da48cfc6.tar.gz
nova-457e19826cfdb7f8f324180e42d8df79da48cfc6.tar.xz
nova-457e19826cfdb7f8f324180e42d8df79da48cfc6.zip
renamed sharedipgroups to shared_ip_groups and fixed tests for display_name
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/__init__.py4
-rw-r--r--nova/api/openstack/shared_ip_groups.py (renamed from nova/api/openstack/sharedipgroups.py)0
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 0b54c7233..33eac001a 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -39,7 +39,7 @@ from nova.api.openstack import flavors
from nova.api.openstack import images
from nova.api.openstack import ratelimiting
from nova.api.openstack import servers
-from nova.api.openstack import sharedipgroups
+from nova.api.openstack import shared_ip_groups
FLAGS = flags.FLAGS
@@ -114,7 +114,7 @@ class APIRouter(wsgi.Router):
mapper.resource("flavor", "flavors", controller=flavors.Controller(),
collection={'detail': 'GET'})
mapper.resource("shared_ip_group", "shared_ip_groups",
- controller=sharedipgroups.Controller())
+ controller=shared_ip_groups.Controller())
super(APIRouter, self).__init__(mapper)
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/shared_ip_groups.py
index 65595c8ff..65595c8ff 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/shared_ip_groups.py