From b45af9ea940345f48e2e8af8e35a25c9e956fdd8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 4 Sep 2014 12:27:06 +0900 Subject: [PATCH] ofagent: Remove @author tags and update copyright notices When writing these modules, ofagent team (kakuma, yamamoto) thought that @author tag was OpenStack's style to represent authorships. But it turned out to be wrong. Acutally there seems to be a consensus not to use them. So, replace them back to the original Ryu-style copyright notices. Change-Id: Icc9fdd1850c0c1dbd354bb3312199a7f6849925a --- neutron/plugins/ml2/drivers/mech_ofagent.py | 4 +++- neutron/plugins/ofagent/agent/arp_lib.py | 5 +++-- neutron/plugins/ofagent/agent/main.py | 5 ++--- neutron/plugins/ofagent/agent/ofa_neutron_agent.py | 4 +++- neutron/plugins/ofagent/common/config.py | 3 ++- neutron/tests/unit/agent/l2population_rpc_base.py | 3 ++- neutron/tests/unit/agent/test_l2population_rpc.py | 3 ++- neutron/tests/unit/ofagent/fake_oflib.py | 6 +++--- neutron/tests/unit/ofagent/ofa_test_base.py | 6 +++--- neutron/tests/unit/ofagent/test_arp_lib.py | 3 ++- neutron/tests/unit/ofagent/test_ofa_defaults.py | 3 ++- neutron/tests/unit/ofagent/test_ofa_neutron_agent.py | 7 ++++--- neutron/tests/unit/ofagent/test_ofa_ports.py | 3 +-- 13 files changed, 32 insertions(+), 23 deletions(-) diff --git a/neutron/plugins/ml2/drivers/mech_ofagent.py b/neutron/plugins/ml2/drivers/mech_ofagent.py index 6a25c98c9..012800183 100644 --- a/neutron/plugins/ml2/drivers/mech_ofagent.py +++ b/neutron/plugins/ml2/drivers/mech_ofagent.py @@ -1,4 +1,7 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# All Rights Reserved. +# # Based on openvswitch mechanism driver. # # Copyright (c) 2013 OpenStack Foundation @@ -15,7 +18,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: Fumihiko Kakuma, VA Linux Systems Japan K.K. from neutron.common import constants from neutron.extensions import portbindings diff --git a/neutron/plugins/ofagent/agent/arp_lib.py b/neutron/plugins/ofagent/agent/arp_lib.py index ceb34c63e..403227344 100644 --- a/neutron/plugins/ofagent/agent/arp_lib.py +++ b/neutron/plugins/ofagent/agent/arp_lib.py @@ -1,4 +1,7 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# Copyright (C) 2014 YAMAMOTO Takashi +# 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 @@ -11,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: Fumihiko Kakuma, VA Linux Systems Japan K.K. -# @author: YAMAMOTO Takashi, VA Linux Systems Japan K.K. from ryu.app.ofctl import api as ryu_api from ryu.lib import dpid as dpid_lib diff --git a/neutron/plugins/ofagent/agent/main.py b/neutron/plugins/ofagent/agent/main.py index df000f051..5e1397ac5 100755 --- a/neutron/plugins/ofagent/agent/main.py +++ b/neutron/plugins/ofagent/agent/main.py @@ -1,4 +1,6 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# Copyright (C) 2014 YAMAMOTO Takashi # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -12,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: Fumihiko Kakuma, VA Linux Systems Japan K.K. -# @author: YAMAMOTO Takashi, VA Linux Systems Japan K.K. from ryu.lib import hub hub.patch() diff --git a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py index ad2c6f774..15c3735d3 100644 --- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py +++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py @@ -1,5 +1,8 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. # Copyright (C) 2014 YAMAMOTO Takashi +# Copyright (C) 2014 Fumihiko Kakuma +# All Rights Reserved. +# # Based on openvswitch agent. # # Copyright 2011 VMware, Inc. @@ -16,7 +19,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: Fumihiko Kakuma, VA Linux Systems Japan K.K. import time diff --git a/neutron/plugins/ofagent/common/config.py b/neutron/plugins/ofagent/common/config.py index 0b2b44890..8f77269e6 100644 --- a/neutron/plugins/ofagent/common/config.py +++ b/neutron/plugins/ofagent/common/config.py @@ -1,4 +1,6 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# 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 @@ -11,7 +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: Fumihiko Kakuma, VA Linux Systems Japan K.K. from oslo.config import cfg diff --git a/neutron/tests/unit/agent/l2population_rpc_base.py b/neutron/tests/unit/agent/l2population_rpc_base.py index 135f0395e..c9c22de0f 100644 --- a/neutron/tests/unit/agent/l2population_rpc_base.py +++ b/neutron/tests/unit/agent/l2population_rpc_base.py @@ -1,4 +1,6 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# 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 @@ -11,7 +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: Fumihiko Kakuma, VA Linux Systems Japan K.K. import collections import mock diff --git a/neutron/tests/unit/agent/test_l2population_rpc.py b/neutron/tests/unit/agent/test_l2population_rpc.py index 5bb697c98..7b1e05344 100644 --- a/neutron/tests/unit/agent/test_l2population_rpc.py +++ b/neutron/tests/unit/agent/test_l2population_rpc.py @@ -1,4 +1,6 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# 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 @@ -11,7 +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: Fumihiko Kakuma, VA Linux Systems Japan K.K. import contextlib diff --git a/neutron/tests/unit/ofagent/fake_oflib.py b/neutron/tests/unit/ofagent/fake_oflib.py index 5c3d6fef4..005d95866 100644 --- a/neutron/tests/unit/ofagent/fake_oflib.py +++ b/neutron/tests/unit/ofagent/fake_oflib.py @@ -1,4 +1,7 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# Copyright (C) 2014 YAMAMOTO Takashi +# 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 @@ -11,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: Fumihiko Kakuma, VA Linux Systems Japan K.K. -# @author: YAMAMOTO Takashi, VA Linux Systems Japan K.K. import mock diff --git a/neutron/tests/unit/ofagent/ofa_test_base.py b/neutron/tests/unit/ofagent/ofa_test_base.py index 160e152ed..3578f2160 100644 --- a/neutron/tests/unit/ofagent/ofa_test_base.py +++ b/neutron/tests/unit/ofagent/ofa_test_base.py @@ -1,4 +1,7 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# Copyright (C) 2014 YAMAMOTO Takashi +# 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 @@ -11,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: Fumihiko Kakuma, VA Linux Systems Japan K.K. -# @author: YAMAMOTO Takashi, VA Linux Systems Japan K.K. import mock from oslo.config import cfg diff --git a/neutron/tests/unit/ofagent/test_arp_lib.py b/neutron/tests/unit/ofagent/test_arp_lib.py index a7b6bd5b3..a0b0dcdaf 100644 --- a/neutron/tests/unit/ofagent/test_arp_lib.py +++ b/neutron/tests/unit/ofagent/test_arp_lib.py @@ -1,4 +1,6 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# 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 @@ -11,7 +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: Fumihiko Kakuma, VA Linux Systems Japan K.K. import collections import contextlib diff --git a/neutron/tests/unit/ofagent/test_ofa_defaults.py b/neutron/tests/unit/ofagent/test_ofa_defaults.py index 635070b51..51c2cb468 100644 --- a/neutron/tests/unit/ofagent/test_ofa_defaults.py +++ b/neutron/tests/unit/ofagent/test_ofa_defaults.py @@ -1,4 +1,6 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# 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 @@ -11,7 +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: Fumihiko Kakuma, VA Linux Systems Japan K.K. from oslo.config import cfg diff --git a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py index e5d8d3dbf..638b40120 100644 --- a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py +++ b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py @@ -1,4 +1,8 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 Fumihiko Kakuma +# Copyright (C) 2014 YAMAMOTO Takashi +# All Rights Reserved. +# # Based on test for openvswitch agent(test_ovs_neutron_agent.py). # # Copyright (c) 2012 OpenStack Foundation. @@ -14,9 +18,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: Fumihiko Kakuma, VA Linux Systems Japan K.K. -# @author: YAMAMOTO Takashi, VA Linux Systems Japan K.K. import collections import contextlib diff --git a/neutron/tests/unit/ofagent/test_ofa_ports.py b/neutron/tests/unit/ofagent/test_ofa_ports.py index 6e36da749..3e3626393 100644 --- a/neutron/tests/unit/ofagent/test_ofa_ports.py +++ b/neutron/tests/unit/ofagent/test_ofa_ports.py @@ -1,4 +1,5 @@ # Copyright (C) 2014 VA Linux Systems Japan K.K. +# Copyright (C) 2014 YAMAMOTO Takashi # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -12,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: YAMAMOTO Takashi, VA Linux Systems Japan K.K. import mock