x/vmware-nsx
Code Issues Proposed changes

Merge "ryu/plugin, agent: unbreak 610017c460b85e1b7d11327d050972bb03fcc0c3"

Browse Source
This commit is contained in:
Jenkins 2012-08-01 17:19:46 +00:00 committed by Gerrit Code Review
commit 5df522c9d1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quantum/plugins/ryu/agent/ryu_quantum_agent.py
View File

@ -30,6 +30,7 @@ from sqlalchemy.ext.sqlsoup import SqlSoup
from quantum.agent.linux import ovs_lib from quantum.agent.linux import ovs_lib
from quantum.agent.linux.ovs_lib import VifPort from quantum.agent.linux.ovs_lib import VifPort
from quantum.common import config as logging_config
from quantum.openstack.common import cfg from quantum.openstack.common import cfg
from quantum.plugins.ryu.common import config from quantum.plugins.ryu.common import config

3
quantum/plugins/ryu/ryu_quantum_plugin.py
View File

@ -17,16 +17,15 @@
# @author: Isaku Yamahata # @author: Isaku Yamahata
import logging import logging
import os
from ryu.app import client from ryu.app import client
from ryu.app import rest_nw_id from ryu.app import rest_nw_id
from quantum.common import exceptions as q_exc from quantum.common import exceptions as q_exc
from quantum.common.utils import find_config_file
from quantum.db import api as db from quantum.db import api as db
from quantum.db import db_base_plugin_v2 from quantum.db import db_base_plugin_v2
from quantum.db import models_v2 from quantum.db import models_v2
from quantum.openstack.common import cfg
from quantum.plugins.ryu.db import api as db_api from quantum.plugins.ryu.db import api as db_api
from quantum.plugins.ryu.db import api_v2 as db_api_v2 from quantum.plugins.ryu.db import api_v2 as db_api_v2
from quantum.plugins.ryu import ofp_service_type from quantum.plugins.ryu import ofp_service_type