starlingx
/
fault
Code Issues Proposed changes

Fix the conflict of urlparse between python2 and python3 

Story: 2003310
Task: 27860

Change-Id: Ib8e3932526af47ca0a7306b74000f8e108bd211d
Signed-off-by: brandonzhao <zhaolong@inspur.com>
This commit is contained in:
brandonzhao 2018-10-26 11:37:24 +08:00
parent 4d82104ecf
commit 2e41ac07d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fm-rest-api/fm/fm/db/sqlalchemy/models.py
View File

@ -22,7 +22,7 @@
import json
import urlparse
from six.moves.urllib.parse import urlparse
from oslo_config import cfg
@ -35,7 +35,7 @@ from oslo_db.sqlalchemy import models
def table_args():
engine_name = urlparse.urlparse(cfg.CONF.database_connection).scheme
engine_name = urlparse(cfg.CONF.database_connection).scheme
if engine_name == 'mysql':
return {'mysql_engine': 'InnoDB',
'mysql_charset': "utf8"}