openstack/deb-heat
Code Issues Proposed changes

Use Service objects instead of db_api

Browse Source 
Fix missed place for migration from db_api to Service object.

Change-Id: I1d733d0a1bd13ab860860e4497771c46e7d2118b
This commit is contained in:
Sergey Kraynev 2015-03-23 06:38:21 -04:00
parent 9dc904fddc
commit e5f952e4b5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat/cmd/manage.py
View File

@ -25,8 +25,9 @@ from oslo_log import log
from heat.common import context from heat.common import context
from heat.common.i18n import _ from heat.common.i18n import _
from heat.common import service_utils from heat.common import service_utils
from heat.db import api from heat.db import api as db_api
from heat.db import utils from heat.db import utils
from heat.objects import service as service_objects
from heat import version from heat import version
@ -35,7 +36,7 @@ CONF = cfg.CONF
def do_db_version(): def do_db_version():
"""Print database's current migration level.""" """Print database's current migration level."""
print(api.db_version(api.get_engine())) print(db_api.db_version(db_api.get_engine()))
def do_db_sync(): def do_db_sync():
@ -43,14 +44,14 @@ def do_db_sync():
Place a database under migration control and upgrade, Place a database under migration control and upgrade,
creating first if necessary. creating first if necessary.
""" """
api.db_sync(api.get_engine(), CONF.command.version) db_api.db_sync(db_api.get_engine(), CONF.command.version)
class ServiceManageCommand(object): class ServiceManageCommand(object):
def service_list(self): def service_list(self):
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
services = [service_utils.format_service(service) services = [service_utils.format_service(service)
for service in api.service_get_all(ctxt)] for service in service_objects.Service.get_all(ctxt)]
print_format = "%-16s %-16s %-36s %-10s %-10s %-10s %-10s" print_format = "%-16s %-16s %-36s %-10s %-10s %-10s %-10s"
print(print_format % (_('Hostname'), print(print_format % (_('Hostname'),