Merge lp:~midokura/nova/network-service into lp:~ntt-pf-lab/nova/network-service

[Ryu Ishimoto]

Removed a bad 'return' statement in the migration file.

Removed a bad 'return' statement in the migration file.

=== modified file 'nova/db/sqlalchemy/migrate_repo/versions/015_diablo.py'
--- nova/db/sqlalchemy/migrate_repo/versions/015_diablo.py	2011-04-12 10:57:56 +0000
+++ nova/db/sqlalchemy/migrate_repo/versions/015_diablo.py	2011-04-21 05:21:12 +0000
@@ -68,7 +68,6 @@
     # Upgrade operations go here. Don't create your own engine;
     # bind migrate_engine to your metadata
     meta.bind = migrate_engine
-    return
 
     for table in (instance_virtual_nic_association, 
                   project_network_service_association):
 
=== modified file 'nova/network/service.py'
--- nova/network/service.py	2011-04-17 20:45:38 +0000
+++ nova/network/service.py	2011-04-21 05:21:12 +0000
@@ -468,6 +468,14 @@
         self._mapper = mapper
         self._service = service
 
+    def _get_prefix(self):
+        """ Get the route prefix from the service name.
+
+        Returns:
+            The route prefix.
+        """
+        return "/%s" % str(self._service.__package__).replace(".", "/")
+
     def resource(self, member_name, collection_name, **kwargs):
         """Wrapper method for 'resource' method in python-routes mapper object.
 
@@ -478,23 +486,22 @@
            member_name: REST member routes
            collection_name: REST collection routes
         """
-        _, _, package_name = str(self._service.__package__).rpartition('.')
+        prefix = self._get_prefix() 
         kwargs.pop('path_prefix', None)
         self._mapper.resource(member_name, collection_name,
-                              path_prefix='/%s' % package_name, **kwargs)
+                              path_prefix=prefix, **kwargs)
 
     def connect(self, *args, **kwargs):
         """Wrapper for 'connect' method.
         """
-        _, _, package_name = str(self._service.__package__).rpartition('.')
-
         if len(args) < 1:
             new_args = args
         else:
             end = ()
             if len(args) > 2:
                 end = args[2:]
-            new_path = "/%s%s" % (package_name, args[1])
+            prefix = self._get_prefix() 
+            new_path = "%s%s" % (prefix, args[1])
             new_args = args[0:1] + (new_path, ) + end
 
         self._mapper.connect(*new_args, **kwargs)