Correct NVP license header files

Note: Pointed out by Akihiro but pushed by me as I was the one who
push these files originally so I have to change the license.

Fixes bug: 1209359

Change-Id: I57d0fc588983e1934ad9321d54e642b72bdbdc9c

diff --git a/neutron/plugins/nicira/check_nvp_config.py b/neutron/plugins/nicira/check_nvp_config.py
index ef8d2609bb3808548fca0840b53389eae9878c34..c33ef1af4d37c0a3d6b9a08a9467fd114ee407cc 100644 (file)
--- a/neutron/plugins/nicira/check_nvp_config.py
+++ b/neutron/plugins/nicira/check_nvp_config.py
@@ -9,7 +9,7 @@
 #
 #         http://www.apache.org/licenses/LICENSE-2.0
 #
-#    Unless equired by applicable law or agreed to in writing, software
+#    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

diff --git a/neutron/plugins/nicira/common/metadata_access.py b/neutron/plugins/nicira/common/metadata_access.py
index e54434bdf611b3925c5f80aef8cf75342eed9d51..bd5a0191b6c572a94353967799b81dded13a2efa 100644 (file)
--- a/neutron/plugins/nicira/common/metadata_access.py
+++ b/neutron/plugins/nicira/common/metadata_access.py
@@ -9,7 +9,7 @@
 #
 #         http://www.apache.org/licenses/LICENSE-2.0
 #
-#    Unless equired by applicable law or agreed to in writing, software
+#    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

diff --git a/neutron/plugins/nicira/common/securitygroups.py b/neutron/plugins/nicira/common/securitygroups.py
index 2e43c417977f773981329612292e7fa79f935852..3ca99a9d8249dd15076276057dfef5ddd632e1cc 100644 (file)
--- a/neutron/plugins/nicira/common/securitygroups.py
+++ b/neutron/plugins/nicira/common/securitygroups.py
@@ -9,7 +9,7 @@
 #
 #         http://www.apache.org/licenses/LICENSE-2.0
 #
-#    Unless equired by applicable law or agreed to in writing, software
+#    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

diff --git a/neutron/tests/unit/nicira/test_nvp_api_common.py b/neutron/tests/unit/nicira/test_nvp_api_common.py
index a03776e2467e44b65c37551632ac8b89a9f5b7d8..2943b7fa12fbcc557a3ac7fd2b22453dc1bcb07a 100644 (file)
--- a/neutron/tests/unit/nicira/test_nvp_api_common.py
+++ b/neutron/tests/unit/nicira/test_nvp_api_common.py
@@ -1,9 +1,19 @@
-# Copyright (C) 2009-2011 Nicira Networks, Inc. All Rights Reserved.
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 Nicira, 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
 #
-# This software is provided only under the terms and conditions of a written
-# license agreement with Nicira. If no such agreement applies to you, you are
-# not authorized to use this software. Contact Nicira to obtain an appropriate
-# license: www.nicira.com.
+#    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.
 
 # System
 import httplib

diff --git a/neutron/tests/unit/nicira/test_nvp_api_request.py b/neutron/tests/unit/nicira/test_nvp_api_request.py
index 2a13d3b5bb775d2cce10618ac9228ac7cb1e1fcc..5687f79886128ff80c834726196b3d3ce070800f 100644 (file)
--- a/neutron/tests/unit/nicira/test_nvp_api_request.py
+++ b/neutron/tests/unit/nicira/test_nvp_api_request.py
@@ -1,9 +1,19 @@
-# Copyright (C) 2009-2011 Nicira Networks, Inc. All Rights Reserved.
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 Nicira, 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
 #
-# This software is provided only under the terms and conditions of a written
-# license agreement with Nicira. If no such agreement applies to you, you are
-# not authorized to use this software. Contact Nicira to obtain an appropriate
-# license: www.nicira.com.
+#    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.
 
 import eventlet
 eventlet.monkey_patch()