diff --git a/tacker/agent/linux/daemon.py b/tacker/agent/linux/daemon.py index 48286452c..e60c6d921 100644 --- a/tacker/agent/linux/daemon.py +++ b/tacker/agent/linux/daemon.py @@ -13,8 +13,6 @@ # 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: Mark McClain, DreamHost import atexit import fcntl diff --git a/tacker/agent/linux/external_process.py b/tacker/agent/linux/external_process.py index ebd345255..0d93a8c7d 100644 --- a/tacker/agent/linux/external_process.py +++ b/tacker/agent/linux/external_process.py @@ -13,8 +13,6 @@ # 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: Mark McClain, DreamHost import os diff --git a/tacker/agent/linux/utils.py b/tacker/agent/linux/utils.py index 903dc37fe..af0b54dfc 100644 --- a/tacker/agent/linux/utils.py +++ b/tacker/agent/linux/utils.py @@ -14,8 +14,6 @@ # 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: Juliano Martinez, Locaweb. import fcntl import os diff --git a/tacker/api/v1/resource_helper.py b/tacker/api/v1/resource_helper.py index f52ea6746..3e1a7ecda 100644 --- a/tacker/api/v1/resource_helper.py +++ b/tacker/api/v1/resource_helper.py @@ -12,7 +12,6 @@ # 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. from oslo_config import cfg diff --git a/tacker/common/driver_manager.py b/tacker/common/driver_manager.py index 1abe560d8..a5e0c7215 100644 --- a/tacker/common/driver_manager.py +++ b/tacker/common/driver_manager.py @@ -18,7 +18,6 @@ # License for the specific language governing permissions and limitations # under the License. # -# @author: Isaku Yamahata, Intel Corporation. import logging as log diff --git a/tacker/common/log.py b/tacker/common/log.py index 045c6c1da..139814597 100644 --- a/tacker/common/log.py +++ b/tacker/common/log.py @@ -1,6 +1,5 @@ # Copyright (C) 2013 eNovance SAS # -# Author: Sylvain Afchain # # 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 diff --git a/tacker/db/migration/__init__.py b/tacker/db/migration/__init__.py index faf7722e1..52a9ea34c 100644 --- a/tacker/db/migration/__init__.py +++ b/tacker/db/migration/__init__.py @@ -11,8 +11,6 @@ # 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: Mark McClain, DreamHost from alembic import op import sqlalchemy as sa diff --git a/tacker/db/migration/alembic_migrations/env.py b/tacker/db/migration/alembic_migrations/env.py index 03a4df3d4..4008384c8 100644 --- a/tacker/db/migration/alembic_migrations/env.py +++ b/tacker/db/migration/alembic_migrations/env.py @@ -11,8 +11,6 @@ # 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: Mark McClain, DreamHost from logging import config as logging_config diff --git a/tacker/db/migration/alembic_migrations/versions/1c6b0d82afcd_servicevm_framework.py b/tacker/db/migration/alembic_migrations/versions/1c6b0d82afcd_servicevm_framework.py index 692b9f468..ecdd131b3 100644 --- a/tacker/db/migration/alembic_migrations/versions/1c6b0d82afcd_servicevm_framework.py +++ b/tacker/db/migration/alembic_migrations/versions/1c6b0d82afcd_servicevm_framework.py @@ -16,8 +16,6 @@ # 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: Isaku Yamahata, Intel Corporation. """add tables for servicevm framework diff --git a/tacker/db/migration/cli.py b/tacker/db/migration/cli.py index 2c48fb3b1..b6fb897b3 100644 --- a/tacker/db/migration/cli.py +++ b/tacker/db/migration/cli.py @@ -11,8 +11,6 @@ # 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: Mark McClain, DreamHost import os diff --git a/tacker/db/vm/proxy_db.py b/tacker/db/vm/proxy_db.py index 8256aa737..3e5e6714e 100644 --- a/tacker/db/vm/proxy_db.py +++ b/tacker/db/vm/proxy_db.py @@ -15,8 +15,6 @@ # 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: Isaku Yamahata, Intel Corporation. import sqlalchemy as sa diff --git a/tacker/db/vm/vm_db.py b/tacker/db/vm/vm_db.py index 5cd78a669..18bf8b8ca 100644 --- a/tacker/db/vm/vm_db.py +++ b/tacker/db/vm/vm_db.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. import uuid diff --git a/tacker/tests/tools.py b/tacker/tests/tools.py index f80b30508..ff4951649 100644 --- a/tacker/tests/tools.py +++ b/tacker/tests/tools.py @@ -12,9 +12,6 @@ # 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: Akihiro Motoki, NEC Corporation - """setup_mock_calls and verify_mock_calls are convenient methods to setup a sequence of mock calls. diff --git a/tacker/tests/unit/database_stubs.py b/tacker/tests/unit/database_stubs.py index 4afdb3a82..21129d522 100644 --- a/tacker/tests/unit/database_stubs.py +++ b/tacker/tests/unit/database_stubs.py @@ -14,8 +14,6 @@ # 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: Rohit Agarwalla, Cisco Systems, Inc. """stubs.py provides interface methods for the database test cases""" diff --git a/tacker/tests/unit/extensions/extendedattribute.py b/tacker/tests/unit/extensions/extendedattribute.py index c4b87f6f9..4a47ae740 100644 --- a/tacker/tests/unit/extensions/extendedattribute.py +++ b/tacker/tests/unit/extensions/extendedattribute.py @@ -13,8 +13,6 @@ # 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: Kaiwei Fan, VMware, Inc from tacker.api import extensions diff --git a/tacker/tests/unit/extensions/extensionattribute.py b/tacker/tests/unit/extensions/extensionattribute.py index ac1339e71..04d86166a 100644 --- a/tacker/tests/unit/extensions/extensionattribute.py +++ b/tacker/tests/unit/extensions/extensionattribute.py @@ -14,9 +14,6 @@ # 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: Kaiwei Fan, VMware, Inc -# import abc diff --git a/tacker/tests/unit/services/vm/test_servicevm_extension.py b/tacker/tests/unit/services/vm/test_servicevm_extension.py index c12f52c92..6f3abafd5 100644 --- a/tacker/tests/unit/services/vm/test_servicevm_extension.py +++ b/tacker/tests/unit/services/vm/test_servicevm_extension.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. import copy import uuid diff --git a/tacker/tests/unit/test_api_api_common.py b/tacker/tests/unit/test_api_api_common.py index bd4349298..a6135c051 100644 --- a/tacker/tests/unit/test_api_api_common.py +++ b/tacker/tests/unit/test_api_api_common.py @@ -14,9 +14,6 @@ # 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: Zhongyue Luo, Intel Corporation. -# from testtools import matchers from webob import exc diff --git a/tacker/tests/unit/test_api_v2.py b/tacker/tests/unit/test_api_v2.py index dbbaa1dab..d32a1e7d6 100644 --- a/tacker/tests/unit/test_api_v2.py +++ b/tacker/tests/unit/test_api_v2.py @@ -1350,7 +1350,7 @@ class ExtensionTestCase(base.BaseTestCase): self.assertNotIn('v2attrs:something_else', net) -class TestSubresourcePlugin(): +class TestSubresourcePlugin(object): def get_network_dummies(self, context, network_id, filters=None, fields=None): return [] diff --git a/tacker/tests/unit/test_api_v2_extension.py b/tacker/tests/unit/test_api_v2_extension.py index cba3950c4..ac970e038 100644 --- a/tacker/tests/unit/test_api_v2_extension.py +++ b/tacker/tests/unit/test_api_v2_extension.py @@ -15,8 +15,6 @@ # 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: Isaku Yamahata, Intel Corporation. import uuid diff --git a/tacker/tests/unit/test_api_v2_resource.py b/tacker/tests/unit/test_api_v2_resource.py index 12197381d..7033b85d9 100644 --- a/tacker/tests/unit/test_api_v2_resource.py +++ b/tacker/tests/unit/test_api_v2_resource.py @@ -14,9 +14,6 @@ # 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: Zhongyue Luo, Intel Corporation. -# import mock from webob import exc diff --git a/tacker/tests/unit/test_wsgi.py b/tacker/tests/unit/test_wsgi.py index 7bbff90de..d837ba5ca 100644 --- a/tacker/tests/unit/test_wsgi.py +++ b/tacker/tests/unit/test_wsgi.py @@ -783,7 +783,7 @@ class ResourceTest(base.BaseTestCase): def my_fault_body_function(): return 'off' - class FakeRequest(): + class FakeRequest(object): def __init__(self): self.url = 'http://where.no' self.environ = 'environ' @@ -823,7 +823,7 @@ class ResourceTest(base.BaseTestCase): def my_fault_body_function(): return 'off' - class FakeRequest(): + class FakeRequest(object): def __init__(self): self.url = 'http://where.no' self.environ = 'environ' diff --git a/tacker/tests/utils.py b/tacker/tests/utils.py index fb269a5b4..540b1201c 100644 --- a/tacker/tests/utils.py +++ b/tacker/tests/utils.py @@ -19,4 +19,4 @@ def read_file(input_file): yaml_file = os.path.abspath(os.path.join(os.path.dirname(__file__), 'etc/samples/' + str(input_file))) with open(yaml_file, 'r') as f: - return f.read() \ No newline at end of file + return f.read() diff --git a/tacker/vm/constants.py b/tacker/vm/constants.py index 0fcbfb102..c300ddcdf 100644 --- a/tacker/vm/constants.py +++ b/tacker/vm/constants.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. # sevice type SVC_TYPE_ROUTER = 'router' diff --git a/tacker/vm/drivers/abstract_driver.py b/tacker/vm/drivers/abstract_driver.py index 7656e58b0..a7d203171 100644 --- a/tacker/vm/drivers/abstract_driver.py +++ b/tacker/vm/drivers/abstract_driver.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. import abc diff --git a/tacker/vm/drivers/heat/heat.py b/tacker/vm/drivers/heat/heat.py index 3d600c877..f13fa65a6 100644 --- a/tacker/vm/drivers/heat/heat.py +++ b/tacker/vm/drivers/heat/heat.py @@ -447,7 +447,7 @@ class DeviceHeat(abstract_driver.DeviceAbstractDriver): raise NotImplementedError() -class HeatClient: +class HeatClient(object): def __init__(self, context, password=None): # context, password are unused self.stacks = clients.OpenstackClients().heat.stacks diff --git a/tacker/vm/drivers/noop.py b/tacker/vm/drivers/noop.py index a9fd0a6da..b0326b542 100644 --- a/tacker/vm/drivers/noop.py +++ b/tacker/vm/drivers/noop.py @@ -17,8 +17,7 @@ # 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: Isaku Yamahata, Intel Corporation. + # TODO(yamahata): once unittests are impletemted, move this there import uuid diff --git a/tacker/vm/drivers/nova/nova.py b/tacker/vm/drivers/nova/nova.py index 9b9d51afe..f647ff797 100644 --- a/tacker/vm/drivers/nova/nova.py +++ b/tacker/vm/drivers/nova/nova.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. import time diff --git a/tacker/vm/hosting_device_scheduler.py b/tacker/vm/hosting_device_scheduler.py index a334edcd8..c6d514caf 100644 --- a/tacker/vm/hosting_device_scheduler.py +++ b/tacker/vm/hosting_device_scheduler.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. import random diff --git a/tacker/vm/mgmt_drivers/abstract_driver.py b/tacker/vm/mgmt_drivers/abstract_driver.py index a1e984ae9..64ac8b1a5 100644 --- a/tacker/vm/mgmt_drivers/abstract_driver.py +++ b/tacker/vm/mgmt_drivers/abstract_driver.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. import abc diff --git a/tacker/vm/mgmt_drivers/constants.py b/tacker/vm/mgmt_drivers/constants.py index aa2bdea1f..006f4920f 100644 --- a/tacker/vm/mgmt_drivers/constants.py +++ b/tacker/vm/mgmt_drivers/constants.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. # key KEY_ACTION = 'action' diff --git a/tacker/vm/mgmt_drivers/noop.py b/tacker/vm/mgmt_drivers/noop.py index dffb74c5f..4f6bc35c6 100644 --- a/tacker/vm/mgmt_drivers/noop.py +++ b/tacker/vm/mgmt_drivers/noop.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. from tacker.openstack.common import log as logging from tacker.vm.mgmt_drivers import abstract_driver diff --git a/tacker/vm/mgmt_drivers/openwrt/openwrt.py b/tacker/vm/mgmt_drivers/openwrt/openwrt.py index 7c6333d01..5ff0479a8 100644 --- a/tacker/vm/mgmt_drivers/openwrt/openwrt.py +++ b/tacker/vm/mgmt_drivers/openwrt/openwrt.py @@ -15,8 +15,6 @@ # 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: Isaku Yamahata, Intel Corporation. from oslo_config import cfg import yaml diff --git a/tacker/vm/monitor.py b/tacker/vm/monitor.py index 10c573927..816278c3b 100644 --- a/tacker/vm/monitor.py +++ b/tacker/vm/monitor.py @@ -15,8 +15,6 @@ # 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: Isaku Yamahata, Intel Corporation. import abc import inspect diff --git a/tacker/vm/plugin.py b/tacker/vm/plugin.py index 9071817bf..21dd0089b 100644 --- a/tacker/vm/plugin.py +++ b/tacker/vm/plugin.py @@ -17,8 +17,6 @@ # 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: Isaku Yamahata, Intel Corporation. import copy import inspect diff --git a/test-requirements.txt b/test-requirements.txt index 130317720..b7444b042 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ coverage>=3.6 discover doc8 # Apache-2.0 fixtures>=1.3.1 -hacking<0.10,>=0.9.2 +hacking<0.11,>=0.10.2 mock>=1.2 python-subunit>=0.0.18 ordereddict