OpenStack Compute (nova)

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

  1. network-service
  2. Merge into network-service
Proposed by Ryu Ishimoto
Status: Merged
Merge reported by: Ryu Ishimoto
Merged at revision: not available
Proposed branch: lp:~midokura/nova/network-service
Merge into: lp:~ntt-pf-lab/nova/network-service
Diff against target: 58 lines (+12/-6)
2 files modified
nova/db/sqlalchemy/migrate_repo/versions/015_diablo.py (+0/-1)
nova/network/service.py (+12/-5)
To merge this branch: bzr merge lp:~midokura/nova/network-service
Reviewer Review Type Date Requested Status
NTT PF Lab. Pending
Review via email: mp+58614@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/db/sqlalchemy/migrate_repo/versions/015_diablo.py'
2--- nova/db/sqlalchemy/migrate_repo/versions/015_diablo.py 2011-04-12 10:57:56 +0000
3+++ nova/db/sqlalchemy/migrate_repo/versions/015_diablo.py 2011-04-21 05:21:12 +0000
4@@ -68,7 +68,6 @@
5 # Upgrade operations go here. Don't create your own engine;
6 # bind migrate_engine to your metadata
7 meta.bind = migrate_engine
8- return
9
10 for table in (instance_virtual_nic_association,
11 project_network_service_association):
12
13=== modified file 'nova/network/service.py'
14--- nova/network/service.py 2011-04-17 20:45:38 +0000
15+++ nova/network/service.py 2011-04-21 05:21:12 +0000
16@@ -468,6 +468,14 @@
17 self._mapper = mapper
18 self._service = service
19
20+ def _get_prefix(self):
21+ """ Get the route prefix from the service name.
22+
23+ Returns:
24+ The route prefix.
25+ """
26+ return "/%s" % str(self._service.__package__).replace(".", "/")
27+
28 def resource(self, member_name, collection_name, **kwargs):
29 """Wrapper method for 'resource' method in python-routes mapper object.
30
31@@ -478,23 +486,22 @@
32 member_name: REST member routes
33 collection_name: REST collection routes
34 """
35- _, _, package_name = str(self._service.__package__).rpartition('.')
36+ prefix = self._get_prefix()
37 kwargs.pop('path_prefix', None)
38 self._mapper.resource(member_name, collection_name,
39- path_prefix='/%s' % package_name, **kwargs)
40+ path_prefix=prefix, **kwargs)
41
42 def connect(self, *args, **kwargs):
43 """Wrapper for 'connect' method.
44 """
45- _, _, package_name = str(self._service.__package__).rpartition('.')
46-
47 if len(args) < 1:
48 new_args = args
49 else:
50 end = ()
51 if len(args) > 2:
52 end = args[2:]
53- new_path = "/%s%s" % (package_name, args[1])
54+ prefix = self._get_prefix()
55+ new_path = "%s%s" % (prefix, args[1])
56 new_args = args[0:1] + (new_path, ) + end
57
58 self._mapper.connect(*new_args, **kwargs)

Subscribers

People subscribed via source and target branches

to status/vote changes: