Merge "Remove unused logging module import"

neutron_vpnaas/db/vpn/vpn_validator.py

@@ -21,13 +21,10 @@ from neutron.db import l3_db
 from neutron.db import models_v2
 from neutron import manager
 from neutron.plugins.common import constants as nconstants
-from oslo_log import log as logging
 
 from neutron_vpnaas.extensions import vpnaas
 from neutron_vpnaas.services.vpn.common import constants
 
-LOG = logging.getLogger(__name__)
-
 
 class VpnReferenceValidator(object):
 

neutron_vpnaas/services/vpn/device_drivers/fedora_strongswan_ipsec.py

@@ -16,12 +16,10 @@
 import os
 
 from oslo_config import cfg
-from oslo_log import log as logging
 
 from neutron_vpnaas.services.vpn.device_drivers import ipsec
 from neutron_vpnaas.services.vpn.device_drivers import strongswan_ipsec
 
-LOG = logging.getLogger(__name__)
 TEMPLATE_PATH = os.path.dirname(os.path.abspath(__file__))
 
 cfg.CONF.set_default(name='default_config_area',

neutron_vpnaas/services/vpn/device_drivers/libreswan_ipsec.py

@@ -15,12 +15,8 @@
 import os
 import os.path
 
-from oslo_log import log as logging
-
 from neutron_vpnaas.services.vpn.device_drivers import ipsec
 
-LOG = logging.getLogger(__name__)
-
 
 class LibreSwanProcess(ipsec.OpenSwanProcess):
     """Libreswan Process manager class.

neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py

@@ -17,13 +17,11 @@ import os
 import shutil
 
 from oslo_config import cfg
-from oslo_log import log as logging
 
 from neutron.agent.linux import ip_lib
 from neutron.plugins.common import constants
 from neutron_vpnaas.services.vpn.device_drivers import ipsec
 
-LOG = logging.getLogger(__name__)
 TEMPLATE_PATH = os.path.dirname(os.path.abspath(__file__))
 
 strongswan_opts = [

neutron_vpnaas/services/vpn/service_drivers/base_ipsec.py

@@ -15,15 +15,12 @@
 import abc
 
 import netaddr
-from oslo_log import log as logging
 import oslo_messaging
 import six
 
 from neutron_vpnaas.services.vpn import service_drivers
 
 
-LOG = logging.getLogger(__name__)
-
 IPSEC = 'ipsec'
 BASE_IPSEC_VERSION = '1.0'
 

neutron_vpnaas/services/vpn/service_drivers/ipsec.py

@@ -14,15 +14,12 @@
 #    under the License.
 
 from neutron.common import rpc as n_rpc
-from oslo_log import log as logging
 
 from neutron_vpnaas.services.vpn.common import topics
 from neutron_vpnaas.services.vpn.service_drivers import base_ipsec
 from neutron_vpnaas.services.vpn.service_drivers import ipsec_validator
 
 
-LOG = logging.getLogger(__name__)
-
 IPSEC = 'ipsec'
 BASE_IPSEC_VERSION = '1.0'
 

neutron_vpnaas/services/vpn/service_drivers/ipsec_validator.py

@@ -13,14 +13,10 @@
 #    under the License.
 
 from neutron.common import exceptions
-from oslo_log import log as logging
 
 from neutron_vpnaas.db.vpn import vpn_validator
 
 
-LOG = logging.getLogger(__name__)
-
-
 class IpsecValidationFailure(exceptions.BadRequest):
     message = _("IPSec does not support %(resource)s attribute %(key)s "
                 "with value '%(value)s'")

neutron_vpnaas/services/vpn/vyatta_agent.py

@@ -17,13 +17,10 @@
 from networking_brocade.vyatta.common import l3_agent as vyatta_l3
 from neutron.agent import l3_agent as entry
 from oslo_config import cfg
-from oslo_log import log as logging
 
 from neutron_vpnaas.services.vpn import vyatta_vpn_service
 
 
-LOG = logging.getLogger(__name__)
-
 vpn_agent_opts = [
     cfg.MultiStrOpt(
         'vpn_device_driver',

neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py

@@ -1253,7 +1253,7 @@ class TestOpenSwanProcess(IPSecDeviceLegacy):
                 side_effect=[io.StringIO(u'invalid'),
                              IOError])
     def test_process_running_bogus_pid(self, mock_open, mock_exists):
-        with mock.patch.object(libreswan_ipsec.LOG, 'error'):
+        with mock.patch.object(openswan_ipsec.LOG, 'error'):
             self.assertFalse(self.process._process_running())
             self.assertTrue(mock_exists.called)
             self.assertEqual(2, mock_open.call_count)

rally-jobs/plugins/test_vpn_tenant_scenario.py

@@ -12,14 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from rally.common import log as logging
 from rally.task import scenario
 from rally.task import types as types
 
 import vpn_base
 
-LOG = logging.getLogger(__name__)
-
 
 class VpnTenantScenario(vpn_base.VpnBase):
     """Rally scenarios for VPNaaS"""