From: Dan Wendlandt Date: Mon, 28 Jan 2013 07:58:30 +0000 (-0800) Subject: Revert "Reqd. core_plugin for plugin agents & show cfg opts loaded." X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=32daf52381f08b890360f87d9f82deb9825ea85d;p=openstack-build%2Fneutron-build.git Revert "Reqd. core_plugin for plugin agents & show cfg opts loaded." This reverts commit 06ce1329a044b8e7be9db59811d4f4316d0d0743. bug 1059923 patch was found to not be a valid fix. Change-Id: I465974f60fd65b4d2c9449267ab108fac13d70c8 --- diff --git a/quantum/agent/common/validate.py b/quantum/agent/common/validate.py deleted file mode 100644 index 763f84200..000000000 --- a/quantum/agent/common/validate.py +++ /dev/null @@ -1,28 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright 2013 Cisco Systems, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# @author: Paul Michali, Cisco Systems, Inc. - - -def core_config_options(options): - '''Validate core configuration options. - - Make sure that core configuration options that are needed are present and, - if not, generate warnings/errors, based on the severity. Will be used - only by the agents that require the option(s). - ''' - - if options.core_plugin is None: - raise Exception(_('Quantum core_plugin not configured!')) diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py index 64ccaaeaf..56d11ccfd 100755 --- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py +++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py @@ -27,14 +27,12 @@ import sys import time import eventlet -import logging as std_logging import pyudev from quantum.agent.linux import ip_lib from quantum.agent.linux import utils from quantum.agent import rpc as agent_rpc from quantum.agent import securitygroups_rpc as sg_rpc -from quantum.agent.common import validate from quantum.common import config as logging_config from quantum.common import topics from quantum.common import utils as q_utils @@ -604,10 +602,6 @@ def main(): cfg.CONF(project='quantum') logging_config.setup_logging(cfg.CONF) - - cfg.CONF.log_opt_values(LOG, std_logging.DEBUG) - validate.core_config_options(cfg.CONF) - try: interface_mappings = q_utils.parse_mappings( cfg.CONF.LINUX_BRIDGE.physical_interface_mappings) diff --git a/quantum/plugins/nec/agent/nec_quantum_agent.py b/quantum/plugins/nec/agent/nec_quantum_agent.py index 5dc306e9b..8c8786b4e 100755 --- a/quantum/plugins/nec/agent/nec_quantum_agent.py +++ b/quantum/plugins/nec/agent/nec_quantum_agent.py @@ -24,9 +24,7 @@ import socket import sys import time -import logging as std_logging -from quantum.agent.common import validate from quantum.agent.linux import ovs_lib from quantum.common import config as logging_config from quantum.common import topics @@ -114,9 +112,6 @@ def main(): logging_config.setup_logging(config.CONF) - config.CONF.log_opt_values(LOG, std_logging.DEBUG) - validate.core_config_options(config.CONF) - # Determine which agent type to use. integ_br = config.OVS.integration_bridge root_helper = config.AGENT.root_helper diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py index 9a335d971..a814895b7 100755 --- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py +++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py @@ -24,9 +24,7 @@ import sys import time import eventlet -import logging as std_logging -from quantum.agent.common import validate from quantum.agent.linux import ip_lib from quantum.agent.linux import ovs_lib from quantum.agent.linux import utils @@ -703,9 +701,6 @@ def main(): cfg.CONF(project='quantum') logging_config.setup_logging(cfg.CONF) - cfg.CONF.log_opt_values(LOG, std_logging.DEBUG) - validate.core_config_options(cfg.CONF) - try: agent_config = create_agent_config_map(cfg.CONF) except ValueError as e: diff --git a/quantum/plugins/ryu/agent/ryu_quantum_agent.py b/quantum/plugins/ryu/agent/ryu_quantum_agent.py index bc6e5df04..e20dba9ca 100755 --- a/quantum/plugins/ryu/agent/ryu_quantum_agent.py +++ b/quantum/plugins/ryu/agent/ryu_quantum_agent.py @@ -24,14 +24,12 @@ import httplib import socket import sys -import logging as std_logging import netifaces from ryu.app import client from ryu.app import conf_switch_key from ryu.app import rest_nw_id from sqlalchemy.ext.sqlsoup import SqlSoup -from quantum.agent.common import validate from quantum.agent.linux import ovs_lib from quantum.agent.linux.ovs_lib import VifPort from quantum.common import config as logging_config @@ -212,9 +210,6 @@ def main(): logging_config.setup_logging(cfg.CONF) - cfg.CONF.log_opt_values(LOG, std_logging.DEBUG) - validate.core_config_options(cfg.CONF) - integ_br = cfg.CONF.OVS.integration_bridge root_helper = cfg.CONF.AGENT.root_helper options = {"sql_connection": cfg.CONF.DATABASE.sql_connection} diff --git a/quantum/tests/unit/test_agent_config.py b/quantum/tests/unit/test_agent_config.py index 8c1e4398c..73e10ed01 100644 --- a/quantum/tests/unit/test_agent_config.py +++ b/quantum/tests/unit/test_agent_config.py @@ -15,30 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. -import unittest2 as unittest - from quantum.agent.common import config -from quantum.agent.common import validate -from quantum.openstack.common import cfg def test_setup_conf(): conf = config.setup_conf() assert conf.state_path.endswith('/var/lib/quantum') - - -class TestCoreConfigOptions(unittest.TestCase): - - def setUp(self): - self._saved_core_plugin = cfg.CONF.core_plugin - - def tearDown(self): - cfg.CONF.set_override('core_plugin', self._saved_core_plugin) - - def test_missing_required_core_option(self): - with self.assertRaises(Exception) as ex: - validate.core_config_options(cfg.CONF) - - def test_have_required_core_option(self): - cfg.CONF.set_override('core_plugin', 'some_core_plugin_option') - validate.core_config_options(cfg.CONF)