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

diff --git a/neutron/plugins/ml2/drivers/mech_ofagent.py b/neutron/plugins/ml2/drivers/mech_ofagent.py
index 6a25c98c9efcd3733883301efbee12fe0a595707..012800183f93246d298b5276a17a78e46f483c42 100644 (file)
--- 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 <kakuma at valinux co jp>
+# 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 ceb34c63e373e936cb50935b7cc932c5d9b48f46..4032273441569a49f28f62e78038427391783a09 100644 (file)
--- 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 <kakuma at valinux co jp>
+# Copyright (C) 2014 YAMAMOTO Takashi <yamamoto at valinux co jp>
+# 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 df000f0511a199d6ce5f3005125038e71d3ffb09..5e1397ac5a422ade835333d43739cbc1e5b1eff9 100755 (executable)
--- 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 <kakuma at valinux co jp>
+# Copyright (C) 2014 YAMAMOTO Takashi <yamamoto at valinux co jp>
 # 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 ad2c6f774fb9ff82b253206bdbb231851920bf4c..15c3735d3083159eb2f4d18d19d06be50143e916 100644 (file)
--- 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 <yamamoto at valinux co jp>
+# Copyright (C) 2014 Fumihiko Kakuma <kakuma at valinux co jp>
+# 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 0b2b44890bd40246bd543f7d2cd29a63db9fc3d6..8f77269e61b7cf1699a6819a4aa1ecb17a54994e 100644 (file)
--- 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 <kakuma at valinux co jp>
+# 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 135f0395ec410e9b46b34e7414fa50f3ae66f0f8..c9c22de0fff16b3822957fc11d7b59ef98612eb0 100644 (file)
--- 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 <kakuma at valinux co jp>
+# 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 5bb697c981ec2981314ac8a3bb3a125a522d72bb..7b1e053449702e1dd8a857a661a37c57ff23b819 100644 (file)
--- 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 <kakuma at valinux co jp>
+# 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 5c3d6fef476844db596b02569c679ac3ddb61ff0..005d95866b0b391c2ca641e17613ad0772a5c9d9 100644 (file)
--- 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 <kakuma at valinux co jp>
+# Copyright (C) 2014 YAMAMOTO Takashi <yamamoto at valinux co jp>
+# 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 160e152edb0c2fab67af69df4abe77195be03aac..3578f21601e598c6a7180d399b5ffe622b05b4de 100644 (file)
--- 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 <kakuma at valinux co jp>
+# Copyright (C) 2014 YAMAMOTO Takashi <yamamoto at valinux co jp>
+# 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 a7b6bd5b37cee6a5eecae02a484d2892167efd51..a0b0dcdafc31a75800dc427739e37244576ef849 100644 (file)
--- 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 <kakuma at valinux co jp>
+# 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 635070b51a876f1bba73eb79458943497beda33c..51c2cb46835551217aa1e11637c02eb6d393ec2a 100644 (file)
--- 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 <kakuma at valinux co jp>
+# 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 e5d8d3dbfa7b96ef4b5c4707d79b8a695e4842a3..638b40120ed8e798c2c45f6778b49ebfed6845a9 100644 (file)
--- 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 <kakuma at valinux co jp>
+# Copyright (C) 2014 YAMAMOTO Takashi <yamamoto at valinux co jp>
+# 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 6e36da749233e477b076ee7237620e2ec282e228..3e362639315a4b18076edd71b5697451dfcf1abe 100644 (file)
--- 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 <yamamoto at valinux co jp>
 # 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