renaming resource_factory to create_resource

14 files changed, 30 insertions, 30 deletions

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index fbbd99cb9..4419d0748 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -99,19 +99,19 @@ class APIRouter(base_wsgi.Router):
             server_members['inject_network_info'] = 'POST'
 
             mapper.resource("zone", "zones",
-                        controller=zones.resource_factory(),
+                        controller=zones.create_resource(),
                         collection={'detail': 'GET', 'info': 'GET'}),
 
             mapper.resource("user", "users",
-                        controller=users.resource_factory(),
+                        controller=users.create_resource(),
                         collection={'detail': 'GET'})
 
             mapper.resource("account", "accounts",
-                            controller=accounts.resource_factory(),
+                            controller=accounts.create_resource(),
                             collection={'detail': 'GET'})
 
         mapper.resource("console", "consoles",
-                        controller=consoles.resource_factory(),
+                        controller=consoles.create_resource(),
                         parent_resource=dict(member_name='server',
                         collection_name='servers'))
 
@@ -124,31 +124,31 @@ class APIRouterV10(APIRouter):
     def _setup_routes(self, mapper):
         super(APIRouterV10, self)._setup_routes(mapper)
         mapper.resource("server", "servers",
-                        controller=servers.resource_factory('1.0'),
+                        controller=servers.create_resource('1.0'),
                         collection={'detail': 'GET'},
                         member=self.server_members)
 
         mapper.resource("image", "images",
-                        controller=images.resource_factory('1.0'),
+                        controller=images.create_resource('1.0'),
                         collection={'detail': 'GET'})
 
         mapper.resource("flavor", "flavors",
-                        controller=flavors.resource_factory('1.0'),
+                        controller=flavors.create_resource('1.0'),
                         collection={'detail': 'GET'})
 
         mapper.resource("shared_ip_group", "shared_ip_groups",
                         collection={'detail': 'GET'},
-                        controller=shared_ip_groups.resource_factory())
+                        controller=shared_ip_groups.create_resource())
 
         mapper.resource("backup_schedule", "backup_schedule",
-                        controller=backup_schedules.resource_factory(),
+                        controller=backup_schedules.create_resource(),
                         parent_resource=dict(member_name='server',
                         collection_name='servers'))
 
         mapper.resource("limit", "limits",
-                        controller=limits.resource_factory('1.0'))
+                        controller=limits.create_resource('1.0'))
 
-        mapper.resource("ip", "ips", controller=ips.resource_factory(),
+        mapper.resource("ip", "ips", controller=ips.create_resource(),
                         collection=dict(public='GET', private='GET'),
                         parent_resource=dict(member_name='server',
                                              collection_name='servers'))
@@ -160,27 +160,27 @@ class APIRouterV11(APIRouter):
     def _setup_routes(self, mapper):
         super(APIRouterV11, self)._setup_routes(mapper)
         mapper.resource("server", "servers",
-                        controller=servers.resource_factory('1.1'),
+                        controller=servers.create_resource('1.1'),
                         collection={'detail': 'GET'},
                         member=self.server_members)
 
         mapper.resource("image", "images",
-                        controller=images.resource_factory('1.1'),
+                        controller=images.create_resource('1.1'),
                         collection={'detail': 'GET'})
 
         mapper.resource("image_meta", "meta",
-                        controller=image_metadata.resource_factory(),
+                        controller=image_metadata.create_resource(),
                         parent_resource=dict(member_name='image',
                         collection_name='images'))
 
         mapper.resource("server_meta", "meta",
-                        controller=server_metadata.resource_factory(),
+                        controller=server_metadata.create_resource(),
                         parent_resource=dict(member_name='server',
                         collection_name='servers'))
 
         mapper.resource("flavor", "flavors",
-                        controller=flavors.resource_factory('1.1'),
+                        controller=flavors.create_resource('1.1'),
                         collection={'detail': 'GET'})
 
         mapper.resource("limit", "limits",
-                        controller=limits.resource_factory('1.1'))
+                        controller=limits.create_resource('1.1'))
diff --git a/nova/api/openstack/accounts.py b/nova/api/openstack/accounts.py
index faff8bb2c..0dcd37217 100644
--- a/nova/api/openstack/accounts.py
+++ b/nova/api/openstack/accounts.py
@@ -80,7 +80,7 @@ class Controller(object):
         return dict(account=_translate_keys(account))
 
 
-def resource_factory():
+def create_resource():
     metadata = {
         "attributes": {
             "account": ["id", "name", "description", "manager"],
diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index d08a4799c..71a14d4ce 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -52,7 +52,7 @@ class Controller(object):
         return faults.Fault(exc.HTTPNotImplemented())
 
 
-def resource_factory():
+def create_resource():
     metadata = {
         'attributes': {
             'backupSchedule': [],
diff --git a/nova/api/openstack/consoles.py b/nova/api/openstack/consoles.py
index 56f79db60..bccf04d8f 100644
--- a/nova/api/openstack/consoles.py
+++ b/nova/api/openstack/consoles.py
@@ -89,7 +89,7 @@ class Controller(object):
         return exc.HTTPAccepted()
 
 
-def resource_factory():
+def create_resource():
     metadata = {
         'attributes': {
             'console': [],
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index 9e98e6c27..a21ff6cb2 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -74,7 +74,7 @@ class ControllerV11(Controller):
         return views.flavors.ViewBuilderV11(base_url)
 
 
-def resource_factory(version='1.0'):
+def create_resource(version='1.0'):
     controller = {
         '1.0': ControllerV10,
         '1.1': ControllerV11,
diff --git a/nova/api/openstack/image_metadata.py b/nova/api/openstack/image_metadata.py
index 8acde9fe8..88e10168d 100644
--- a/nova/api/openstack/image_metadata.py
+++ b/nova/api/openstack/image_metadata.py
@@ -102,7 +102,7 @@ class Controller(object):
         self.image_service.update(context, image_id, img, None)
 
 
-def resource_factory():
+def create_resource():
     serializers = {
         'application/xml': wsgi.XMLDictSerializer(xmlns=wsgi.XMLNS_V11),
     }
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index a9071ed8a..3376f358a 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -145,7 +145,7 @@ class ControllerV11(Controller):
         return common.XML_NS_V11
 
 
-def resource_factory(version='1.0'):
+def create_resource(version='1.0'):
     controller = {
         '1.0': ControllerV10,
         '1.1': ControllerV11,
diff --git a/nova/api/openstack/ips.py b/nova/api/openstack/ips.py
index 87c8c997a..abea71830 100644
--- a/nova/api/openstack/ips.py
+++ b/nova/api/openstack/ips.py
@@ -63,7 +63,7 @@ class Controller(object):
         return faults.Fault(exc.HTTPNotImplemented())
 
 
-def resource_factory():
+def create_resource():
     metadata = {
         'list_collections': {
             'public':  {'item_name': 'ip', 'item_key': 'addr'},
diff --git a/nova/api/openstack/limits.py b/nova/api/openstack/limits.py
index b0e093702..2d9fe356f 100644
--- a/nova/api/openstack/limits.py
+++ b/nova/api/openstack/limits.py
@@ -73,7 +73,7 @@ class LimitsControllerV11(LimitsController):
         return limits_views.ViewBuilderV11()
 
 
-def resource_factory(version='1.0'):
+def create_resource(version='1.0'):
     controller = {
         '1.0': LimitsControllerV10,
         '1.1': LimitsControllerV11,
diff --git a/nova/api/openstack/server_metadata.py b/nova/api/openstack/server_metadata.py
index eff98c060..b38b84a2a 100644
--- a/nova/api/openstack/server_metadata.py
+++ b/nova/api/openstack/server_metadata.py
@@ -91,7 +91,7 @@ class Controller(object):
         raise error
 
 
-def resource_factory():
+def create_resource():
     serializers = {
         'application/xml': wsgi.XMLDictSerializer(xmlns=wsgi.XMLNS_V11),
     }
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 8f39bd256..bdd2960d9 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -784,7 +784,7 @@ class ServerXMLDeserializer(wsgi.XMLDeserializer):
         return ""
 
 
-def resource_factory(version='1.0'):
+def create_resource(version='1.0'):
     controller = {
         '1.0': ControllerV10,
         '1.1': ControllerV11,
diff --git a/nova/api/openstack/shared_ip_groups.py b/nova/api/openstack/shared_ip_groups.py
index db178f2a2..4f11f8dfb 100644
--- a/nova/api/openstack/shared_ip_groups.py
+++ b/nova/api/openstack/shared_ip_groups.py
@@ -49,5 +49,5 @@ class Controller(object):
         raise faults.Fault(exc.HTTPNotImplemented())
 
 
-def resource_factory():
+def create_resource():
     return wsgi.Resource(Controller())
diff --git a/nova/api/openstack/users.py b/nova/api/openstack/users.py
index e14616349..50975fc1f 100644
--- a/nova/api/openstack/users.py
+++ b/nova/api/openstack/users.py
@@ -98,7 +98,7 @@ class Controller(object):
         return dict(user=_translate_keys(self.manager.get_user(id)))
 
 
-def resource_factory():
+def create_resource():
     metadata = {
         "attributes": {
             "user": ["id", "name", "access", "secret", "admin"],
diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py
index e750fc230..0475deb52 100644
--- a/nova/api/openstack/zones.py
+++ b/nova/api/openstack/zones.py
@@ -93,7 +93,7 @@ class Controller(object):
         return dict(zone=_scrub_zone(zone))
 
 
-def resource_factory():
+def create_resource():
     metadata = {
         "attributes": {
             "zone": ["id", "api_url", "name", "capabilities"],