Update License Headers to replace Nicira with VMware

In the process __init__.py involved have been emptied;
vim modelines and author lines have been dropped from
the license headers affected by the change as well.

Partial-implements blueprint nicira-plugin-renaming

Change-Id: I9c535b59bb2e83f275816472e0e32b41444d3bbe

diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py
index 21d0957730b8e0e64bb591f6b72549139e35652f..ee9641d1478dbd157b950d7133604aaa8691d78b 100644 (file)
--- a/neutron/agent/l3_agent.py
+++ b/neutron/agent/l3_agent.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2012 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2012 VMware, 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
@@ -14,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# @author: Dan Wendlandt, Nicira, Inc
-#
 
 import eventlet
 import netaddr

diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py
index 53eceaeb42e4cd5ff19673e3e378663c8d3ab954..c040d6ecc30c5ae6a4e6495fc6e97b6c9f6915e7 100644 (file)
--- a/neutron/agent/linux/ovs_lib.py
+++ b/neutron/agent/linux/ovs_lib.py
@@ -1,5 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,10 +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: Somik Behera, Nicira Networks, Inc.
-# @author: Brad Hall, Nicira Networks, Inc.
-# @author: Dan Wendlandt, Nicira Networks, Inc.
-# @author: Dave Lapsley, Nicira Networks, Inc.
 
 import re
 

diff --git a/neutron/common/__init__.py b/neutron/common/__init__.py
index 7e695ff08d5a0255a09f05d18898bbd991a13f50..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/neutron/common/__init__.py
+++ b/neutron/common/__init__.py
@@ -1,16 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, 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
-#
-#    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.
-# @author: Somik Behera, Nicira Networks, Inc.

diff --git a/neutron/common/config.py b/neutron/common/config.py
index fc7058a10d7e658bef7595f63f5638b9966e1a4c..3abddc50c418dbe7047e06549bfcf5e649d1f3dc 100644 (file)
--- a/neutron/common/config.py
+++ b/neutron/common/config.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/common/exceptions.py b/neutron/common/exceptions.py
index 1b23a5274306fa6caf265aaeb511a4fe85053560..c7c57642d1fcbbe5ce013b3cd370207899d4436e 100644 (file)
--- a/neutron/common/exceptions.py
+++ b/neutron/common/exceptions.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 Nicira Networks, Inc
+# Copyright 2011 VMware, Inc
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/common/utils.py b/neutron/common/utils.py
index 1a806ab4953879c10feb9bdc0c16b77d18c350a9..488ef2dd93d75f45f3594939cde04ca2fdb7ca08 100644 (file)
--- a/neutron/common/utils.py
+++ b/neutron/common/utils.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011, Nicira Networks, Inc.
+# Copyright 2011, VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -17,7 +15,6 @@
 #
 # Borrowed from nova code base, more utilities will be added/borrowed as and
 # when needed.
-# @author: Somik Behera, Nicira Networks, Inc.
 
 """Utilities and helper functions."""
 

diff --git a/neutron/db/__init__.py b/neutron/db/__init__.py
index 620282b58310e9d4d831ce4913e983f5cbc980f5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/neutron/db/__init__.py
+++ b/neutron/db/__init__.py
@@ -1,17 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, 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
-#
-#    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.
-# @author: Somik Behera, Nicira Networks, Inc.
-# @author: Brad Hall, Nicira Networks, Inc.

diff --git a/neutron/db/allowedaddresspairs_db.py b/neutron/db/allowedaddresspairs_db.py
index e28576ef3e25b3dbe0702f47942efba0fe666a67..8adf47bc676c1b712f9e05db72ca7fe60a7a2ec6 100644 (file)
--- a/neutron/db/allowedaddresspairs_db.py
+++ b/neutron/db/allowedaddresspairs_db.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2013 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2013 VMware, 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
@@ -14,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# @author: Aaron Rosen, Nicira, Inc
 
 import sqlalchemy as sa
 from sqlalchemy import orm

diff --git a/neutron/db/api.py b/neutron/db/api.py
index 1e05361fac8a0a6ea1e4694006a1b92ec15f25bc..85bd42821ab0202c59e270a36b5e8a45e3f875b9 100644 (file)
--- a/neutron/db/api.py
+++ b/neutron/db/api.py
@@ -1,5 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,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: Somik Behera, Nicira Networks, Inc.
-# @author: Brad Hall, Nicira Networks, Inc.
-# @author: Dan Wendlandt, Nicira Networks, Inc.
 
 import sqlalchemy as sql
 

diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py
index ea9d7a175e0e88f5cefd1c0d593f6488cd6e74a8..4bb6980e148383e589c8521eceee1c454a43eb68 100644 (file)
--- a/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2012 VMware, 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
@@ -13,9 +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: Dan Wendlandt, Nicira, Inc
-#
 
 import netaddr
 import sqlalchemy as sa

diff --git a/neutron/db/l3_gwmode_db.py b/neutron/db/l3_gwmode_db.py
index a53ee71df4dfac6579b37cd68e3dc2e453a89bcc..4c184019f8e5a509c94dcdce06401c43237d25fa 100644 (file)
--- a/neutron/db/l3_gwmode_db.py
+++ b/neutron/db/l3_gwmode_db.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2013 VMware, 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
@@ -14,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# @author: Salvatore Orlando, Nicira, Inc
-#
 
 import sqlalchemy as sa
 

diff --git a/neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py b/neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py
index 1d22a9e42f1e2cf34fa5e1f6f4fcace8864b4b29..ad3356b45ddd1e33b15c5b5ad7a2659824bc0fac 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py
+++ b/neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -28,7 +26,7 @@ revision = '4a666eb208c2'
 down_revision = '38fc1f6789f8'
 
 # Change to ['*'] if this migration applies to all plugins
-# This migration must apply to both Nicira plugins as it alters a table
+# This migration must apply to both NVP/NSX plugins as it alters a table
 # used by both of them
 
 migration_for_plugins = [

diff --git a/neutron/db/portsecurity_db.py b/neutron/db/portsecurity_db.py
index cefe85fb66d17b02ec29d08da9fabf362ebcf55d..d01eecd24b9fd5ac9ea427660a3265b64ca1dcd3 100644 (file)
--- a/neutron/db/portsecurity_db.py
+++ b/neutron/db/portsecurity_db.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2013 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2013 VMware, 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
@@ -13,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: Aaron Rosen, Nicira, Inc
 
 import sqlalchemy as sa
 from sqlalchemy import orm

diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py
index 2a7d2ef035413211b7a329c171e08cad4e32d640..882a43d6256d4a128d5af35e9656da57e59e20bf 100644 (file)
--- a/neutron/db/securitygroups_db.py
+++ b/neutron/db/securitygroups_db.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2012 VMware, 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
@@ -13,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: Aaron Rosen, Nicira, Inc
 
 import sqlalchemy as sa
 from sqlalchemy import orm

diff --git a/neutron/extensions/allowedaddresspairs.py b/neutron/extensions/allowedaddresspairs.py
index fa089ba5350dceaaadf08fd346fdba23d5adfb11..96512f327a69e408ccbbc460cf9562eb6b0961d7 100644 (file)
--- a/neutron/extensions/allowedaddresspairs.py
+++ b/neutron/extensions/allowedaddresspairs.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2013 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2013 VMware, 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
@@ -13,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: Aaron Rosen, Nicira, Inc
 
 import webob.exc
 

diff --git a/neutron/extensions/l3.py b/neutron/extensions/l3.py
index 7ab7d66b16ff067d685906bdf22c7e3e1b915c17..74d10389bae7cb2d68d93cb057d102523260a4a8 100644 (file)
--- a/neutron/extensions/l3.py
+++ b/neutron/extensions/l3.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira Networks, Inc.
+# Copyright 2012 VMware, Inc.
 # All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,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: Dan Wendlandt, Nicira, Inc
-#
 
 from abc import abstractmethod
 

diff --git a/neutron/extensions/l3_ext_gw_mode.py b/neutron/extensions/l3_ext_gw_mode.py
index 0de20110d772ec36cae86476e8667056ecf2eec5..31c943a9c8899d505bf80c07d40f58c4ac157dbe 100644 (file)
--- a/neutron/extensions/l3_ext_gw_mode.py
+++ b/neutron/extensions/l3_ext_gw_mode.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Nicira Networks, Inc.
+# Copyright 2013 VMware, Inc.
 # All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,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: Salvatore Orlando, Nicira, Inc
-#
 
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attrs

diff --git a/neutron/extensions/portsecurity.py b/neutron/extensions/portsecurity.py
index fb3a2b555af8f2a0501557b508d58d17f037e7f6..b652436ed8b767e818f84fdfbb068c001215c98b 100644 (file)
--- a/neutron/extensions/portsecurity.py
+++ b/neutron/extensions/portsecurity.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2013 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2013 VMware, 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
@@ -13,9 +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: Aaron Rosen, Nicira, Inc
-
 
 from neutron.api.v2 import attributes
 from neutron.common import exceptions as qexception

diff --git a/neutron/manager.py b/neutron/manager.py
index eda835d3caedfeca69ca33c217b8e439d0bd8100..9e5ef196779b62475aa59b9302c0de0a98b4fd51 100644 (file)
--- a/neutron/manager.py
+++ b/neutron/manager.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 Nicira Networks, Inc
+# Copyright 2011 VMware, Inc
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,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: Somik Behera, Nicira Networks, Inc.
 
 from oslo.config import cfg
 

diff --git a/neutron/neutron_plugin_base_v2.py b/neutron/neutron_plugin_base_v2.py
index 43b99f5da88b40f3f5a37277a235d4849e7d42a9..603f23e6dfdb814b395716e8b5e72b2bff451962 100644 (file)
--- a/neutron/neutron_plugin_base_v2.py
+++ b/neutron/neutron_plugin_base_v2.py
@@ -1,4 +1,4 @@
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -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: Dan Wendlandt, Nicira, Inc.
 
 """
 v2 Neutron Plug-in API specification.

diff --git a/neutron/plugins/midonet/plugin.py b/neutron/plugins/midonet/plugin.py
index 2977b9b3dd8754781fb2b7b2ce93a0c0a1b16a70..c7190b402d47af7991a889abb926bebef0c61942 100644 (file)
--- a/neutron/plugins/midonet/plugin.py
+++ b/neutron/plugins/midonet/plugin.py
@@ -725,7 +725,7 @@ class MidonetPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
         :param router: Router information provided to create a new router.
         """
 
-        # NOTE(dcahill): Similar to the Nicira plugin, we completely override
+        # NOTE(dcahill): Similar to the NSX plugin, we completely override
         # this method in order to be able to use the MidoNet ID as Neutron ID
         # TODO(dcahill): Propose upstream patch for allowing
         # 3rd parties to specify IDs as we do with l2 plugin

diff --git a/neutron/plugins/nec/agent/nec_neutron_agent.py b/neutron/plugins/nec/agent/nec_neutron_agent.py
index 93766ab6bc7bfb8ade7dce198c4b7fd6ffa75f26..1006d390a2b806f60e7a5635a5be750c1b78396f 100755 (executable)
--- a/neutron/plugins/nec/agent/nec_neutron_agent.py
+++ b/neutron/plugins/nec/agent/nec_neutron_agent.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2012 NEC Corporation.
 # Based on ryu/openvswitch agents.
 #
 # Copyright 2012 Isaku Yamahata <yamahata at private email ne jp>
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/plugins/nicira/NeutronPlugin.py b/neutron/plugins/nicira/NeutronPlugin.py
index 9b9b505677abb04d369ac438fa97c4c5d7cc3a1f..3e076eb9474990c69fb7ce2d864ee02f6661b380 100644 (file)
--- a/neutron/plugins/nicira/NeutronPlugin.py
+++ b/neutron/plugins/nicira/NeutronPlugin.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira, Inc.
+# Copyright 2012 VMware, Inc.
 # All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,11 +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: Somik Behera, Nicira Networks, Inc.
-# @author: Brad Hall, Nicira Networks, Inc.
-# @author: Aaron Rosen, Nicira Networks, Inc.
-
 
 import logging
 import os

diff --git a/neutron/plugins/nicira/__init__.py b/neutron/plugins/nicira/__init__.py
index 07dd0007e2eba51a17a026eaea55dd9dbed29fd8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/neutron/plugins/nicira/__init__.py
+++ b/neutron/plugins/nicira/__init__.py
@@ -1,16 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira Networks, 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
-#
-#    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.

diff --git a/neutron/plugins/nicira/common/securitygroups.py b/neutron/plugins/nicira/common/securitygroups.py
index 8efc476e7db0202fbe0c9a2b5cbbb13fbbd2d18b..d0b71c0374a9344fc1f8dede6ebb1dc0ae08da46 100644 (file)
--- a/neutron/plugins/nicira/common/securitygroups.py
+++ b/neutron/plugins/nicira/common/securitygroups.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Nicira, Inc.
+# Copyright 2013 VMware, Inc.
 # All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,8 +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: Aaron Rosen, Nicira Networks, Inc.
 
 from neutron.openstack.common import log
 from neutron.plugins.nicira.common import nsx_utils

diff --git a/neutron/plugins/nicira/common/sync.py b/neutron/plugins/nicira/common/sync.py
index 963784618329c692f4d92453598dc68968379cb2..bda6ee2ee93bbcbb719ecb9f52ef2556dafea675 100644 (file)
--- a/neutron/plugins/nicira/common/sync.py
+++ b/neutron/plugins/nicira/common/sync.py
@@ -1,4 +1,4 @@
-# Copyright 2013 Nicira, Inc.
+# Copyright 2013 VMware, Inc.
 # All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/plugins/nicira/extensions/distributedrouter.py b/neutron/plugins/nicira/extensions/distributedrouter.py
index 4e5ed1af1c0f0738dce267faabdf75adcd517f4d..aa6949b8263bbf707952eed151bbccbff81fb103 100644 (file)
--- a/neutron/plugins/nicira/extensions/distributedrouter.py
+++ b/neutron/plugins/nicira/extensions/distributedrouter.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc.  All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,7 +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.
-#
 
 from neutron.api.v2 import attributes
 

diff --git a/neutron/plugins/nicira/extensions/maclearning.py b/neutron/plugins/nicira/extensions/maclearning.py
index a3b3a9faadfa5f128b19938365844a9bfa7b7d10..21c669150857dc9cf89d4d24537c5e957da776c2 100644 (file)
--- a/neutron/plugins/nicira/extensions/maclearning.py
+++ b/neutron/plugins/nicira/extensions/maclearning.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc.  All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,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.
-#
-
 
 from neutron.api.v2 import attributes
 

diff --git a/neutron/plugins/nicira/extensions/nvp_qos.py b/neutron/plugins/nicira/extensions/nvp_qos.py
index 75a9d4dc01821bfe03914ccf437251f7ad2ccbd9..1a16d32804d0c80a07453f2b008d86363d774a5a 100644 (file)
--- a/neutron/plugins/nicira/extensions/nvp_qos.py
+++ b/neutron/plugins/nicira/extensions/nvp_qos.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 VMware, Inc.
 # All Rights Reserved
 #

diff --git a/neutron/plugins/nicira/nsx_cluster.py b/neutron/plugins/nicira/nsx_cluster.py
index b2bf35f8e70efe39ec2ffb80cf1372065678dde2..7dc9f85897047db66b4dcbb51fffae998ab4dfc1 100644 (file)
--- a/neutron/plugins/nicira/nsx_cluster.py
+++ b/neutron/plugins/nicira/nsx_cluster.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira, Inc.
+# Copyright 2012 VMware, Inc.
 # All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,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.
-#
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 
 from oslo.config import cfg
 

diff --git a/neutron/plugins/nicira/nvplib.py b/neutron/plugins/nicira/nvplib.py
index f814979ae7898f54cdf3f87b6f039d47f26e1b29..5d72a886bede4572ba192b4bfdbccb09e8fbdd43 100644 (file)
--- a/neutron/plugins/nicira/nvplib.py
+++ b/neutron/plugins/nicira/nvplib.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira Networks, Inc.
+# Copyright 2012 VMware, Inc.
 # All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,11 +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: Brad Hall, Nicira Networks, Inc.
-# @author: Dave Lapsley, Nicira Networks, Inc.
-# @author: Aaron Rosen, Nicira Networks, Inc.
-
 
 import json
 

diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
index 2f5934a6aaeaf1515f75ecc6b75c7e5390582541..d1fe5f96a8c3e16b496b213c1fe36a478c7d8b9f 100644 (file)
--- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,13 +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: Somik Behera, Nicira Networks, Inc.
-# @author: Brad Hall, Nicira Networks, Inc.
-# @author: Dan Wendlandt, Nicira Networks, Inc.
-# @author: Dave Lapsley, Nicira Networks, Inc.
-# @author: Aaron Rosen, Nicira Networks, Inc.
-# @author: Seetharama Ayyadevara, Freescale Semiconductor, Inc.
-# @author: Kyle Mestery, Cisco Systems, Inc.
 
 import distutils.version as dist_version
 import signal

diff --git a/neutron/plugins/openvswitch/ovs_db_v2.py b/neutron/plugins/openvswitch/ovs_db_v2.py
index 821163d80a41ea9af7f939b9b24bf2a79cb389da..c65ffa0d80eec61afb05e14413ea32f52bc165bd 100644 (file)
--- a/neutron/plugins/openvswitch/ovs_db_v2.py
+++ b/neutron/plugins/openvswitch/ovs_db_v2.py
@@ -1,5 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,8 +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: Aaron Rosen, Nicira Networks, Inc.
-# @author: Bob Kukura, Red Hat, Inc.
 
 from sqlalchemy import func
 from sqlalchemy.orm import exc

diff --git a/neutron/plugins/openvswitch/ovs_models_v2.py b/neutron/plugins/openvswitch/ovs_models_v2.py
index ab334c318edc1b0c26da7b4a5e302ec635caffff..ffb6cd0b8c62d4b848f66e4368579e3d4a0b321f 100644 (file)
--- a/neutron/plugins/openvswitch/ovs_models_v2.py
+++ b/neutron/plugins/openvswitch/ovs_models_v2.py
@@ -1,5 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,8 +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: Aaron Rosen, Nicira Networks, Inc.
-# @author: Bob Kukura, Red Hat, Inc.
 
 
 from sqlalchemy import Boolean, Column, ForeignKey, Integer, String

diff --git a/neutron/plugins/openvswitch/ovs_neutron_plugin.py b/neutron/plugins/openvswitch/ovs_neutron_plugin.py
index 55b7827b9f231d65b4984ae46a58a9cef12613e2..7f190b9451e9d8bfb3048ff516fd8977109a83c3 100644 (file)
--- a/neutron/plugins/openvswitch/ovs_neutron_plugin.py
+++ b/neutron/plugins/openvswitch/ovs_neutron_plugin.py
@@ -1,5 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,13 +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: Somik Behera, Nicira Networks, Inc.
-# @author: Brad Hall, Nicira Networks, Inc.
-# @author: Dan Wendlandt, Nicira Networks, Inc.
-# @author: Dave Lapsley, Nicira Networks, Inc.
-# @author: Aaron Rosen, Nicira Networks, Inc.
-# @author: Bob Kukura, Red Hat, Inc.
-# @author: Seetharama Ayyadevara, Freescale Semiconductor, Inc.
 
 import sys
 

diff --git a/neutron/plugins/ryu/agent/ryu_neutron_agent.py b/neutron/plugins/ryu/agent/ryu_neutron_agent.py
index dddbe15cb3b6938d6a23b4c011bca824cd5ecf53..6f261bfec2bd96a41da0c3e3cab7be41b2ef5f27 100755 (executable)
--- a/neutron/plugins/ryu/agent/ryu_neutron_agent.py
+++ b/neutron/plugins/ryu/agent/ryu_neutron_agent.py
@@ -1,10 +1,8 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2012 Isaku Yamahata <yamahata at private email ne jp>
 # Based on openvswitch agent.
 #
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/server/__init__.py b/neutron/server/__init__.py
index a31cdbe403ff68d8857b1f9b24b0209d77886a8c..8c3ebc66c60a97ad4426ad28df5d1cf105cc9fd6 100755 (executable)
--- a/neutron/server/__init__.py
+++ b/neutron/server/__init__.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 Nicira Neworks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/service.py b/neutron/service.py
index d0c2d7eaa2c9a453a8caa683083a3508eabc9b84..2444baca89ca8ec5a5c17e363ed68362c80267dd 100644 (file)
--- a/neutron/service.py
+++ b/neutron/service.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 Nicira Networks, Inc
+# Copyright 2011 VMware, Inc
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/openvswitch/test_ovs_lib.py b/neutron/tests/unit/openvswitch/test_ovs_lib.py
index 27b17060748cb33dde34444e4eaf590b9cce5376..a556cf74f6b4a8427252643f5304278b96376c42 100644 (file)
--- a/neutron/tests/unit/openvswitch/test_ovs_lib.py
+++ b/neutron/tests/unit/openvswitch/test_ovs_lib.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012, Nicira, Inc.
+# Copyright 2012, VMware, Inc.
 #
 #    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
@@ -13,7 +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: Dan Wendlandt, Nicira, Inc.
 
 import mock
 from oslo.config import cfg

diff --git a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py
index 63c4b455d71bbc65d77f530178ea38a87db7c9f1..f6abc5c65e033873b264481b89efb5eb75b438d4 100644 (file)
--- a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py
+++ b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py
@@ -1,5 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 Nicira Networks, Inc.
+# Copyright 2012 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# @author: Dave Lapsley, Nicira Networks, Inc.
 
 import contextlib
 

diff --git a/neutron/tests/unit/test_agent_linux_utils.py b/neutron/tests/unit/test_agent_linux_utils.py
index 6b7fbbfd00d9263984d9541408fae869f1a64130..b0904c3ff248bac93aaca604fde1a81675edd3c1 100644 (file)
--- a/neutron/tests/unit/test_agent_linux_utils.py
+++ b/neutron/tests/unit/test_agent_linux_utils.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012, Nicira, Inc.
+# Copyright 2012, VMware, Inc.
 #
 #    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
@@ -13,7 +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: Dan Wendlandt, Nicira, Inc.
 
 import fixtures
 import mock

diff --git a/neutron/tests/unit/test_extension_ext_gw_mode.py b/neutron/tests/unit/test_extension_ext_gw_mode.py
index dc7a7eb4a4220e2286e99630f46d2c25f623ac89..4e1aa9d5efe0ab1bf5c41f95ced974cb39f30b77 100644 (file)
--- a/neutron/tests/unit/test_extension_ext_gw_mode.py
+++ b/neutron/tests/unit/test_extension_ext_gw_mode.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Nicira Networks, Inc.
+# Copyright 2013 VMware, Inc.
 # All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -15,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# @author: Salvatore Orlando, Nicira, Inc
-#
 
 import mock
 from oslo.config import cfg

diff --git a/neutron/tests/unit/test_l3_agent.py b/neutron/tests/unit/test_l3_agent.py
index 4d199dbad78ca4ace9ef8997b41b4d68c3535132..4608ca48a4a6c1c6110d46306b787ba25cfb4e61 100644 (file)
--- a/neutron/tests/unit/test_l3_agent.py
+++ b/neutron/tests/unit/test_l3_agent.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira, Inc.
+# Copyright 2012 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/test_l3_plugin.py b/neutron/tests/unit/test_l3_plugin.py
index f261dfb6e9b18e9f0f2c1e659d3b00798fc1be0f..f3669009fc1542393f6cc366ab19a3dbe6c44c04 100644 (file)
--- a/neutron/tests/unit/test_l3_plugin.py
+++ b/neutron/tests/unit/test_l3_plugin.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira Networks, Inc.
+# Copyright 2012 VMware, Inc.
 # All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -15,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# @author: Dan Wendlandt, Nicira, Inc
-#
 
 import contextlib
 import copy

diff --git a/neutron/tests/unit/test_neutron_context.py b/neutron/tests/unit/test_neutron_context.py
index 5a36c850e0514ab355cd2c0cac39d286b1200a5a..937e29666e242cb830be2d96f1e070dcf11bd6c8 100644 (file)
--- a/neutron/tests/unit/test_neutron_context.py
+++ b/neutron/tests/unit/test_neutron_context.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira, Inc.
+# Copyright 2012 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/vmware/apiclient/fake.py b/neutron/tests/unit/vmware/apiclient/fake.py
index ce7cb316bd7ab492b7292ab1c6989149e6d4f36e..9ceb72993b4a15834e4bef02ccacb98bb0cbe7aa 100644 (file)
--- a/neutron/tests/unit/vmware/apiclient/fake.py
+++ b/neutron/tests/unit/vmware/apiclient/fake.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 VMware, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py b/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py
index f0c6f9e42fa0060559c54859e384c94072716608..833b140d977eefdaa9f0fc51cf1d8e8260d6c77c 100644 (file)
--- a/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py
+++ b/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (C) 2009-2012 VMware, Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/vmware/db/test_nsx_db.py b/neutron/tests/unit/vmware/db/test_nsx_db.py
index 61ba452d6e5dca7e5b13d573a5e1107eb6c665ac..e6882f61f2910844abc9068e025de3229c94fcbf 100644 (file)
--- a/neutron/tests/unit/vmware/db/test_nsx_db.py
+++ b/neutron/tests/unit/vmware/db/test_nsx_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/neutron/tests/unit/vmware/extensions/test_maclearning.py b/neutron/tests/unit/vmware/extensions/test_maclearning.py
index d664bf3f081279ae800ea33c611c3265b2d6337c..06a86f78942da31719959b0c69118c5c31e26fa4 100644 (file)
--- a/neutron/tests/unit/vmware/extensions/test_maclearning.py
+++ b/neutron/tests/unit/vmware/extensions/test_maclearning.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/tests/unit/vmware/nsxlib/base.py b/neutron/tests/unit/vmware/nsxlib/base.py
index 7956c897d5a230d1bd817551732ebaf80b47dcab..b88e014b60d3150a04c48dafef67350f19c7f772 100644 (file)
--- a/neutron/tests/unit/vmware/nsxlib/base.py
+++ b/neutron/tests/unit/vmware/nsxlib/base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2014 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/neutron/tests/unit/vmware/test_agent_scheduler.py b/neutron/tests/unit/vmware/test_agent_scheduler.py
index 2347cd6f045a0b88dcc0223f0c41212a8fc8f9f7..d4bf97d25032bd94bee35465c8fc3c9db113aa50 100644 (file)
--- a/neutron/tests/unit/vmware/test_agent_scheduler.py
+++ b/neutron/tests/unit/vmware/test_agent_scheduler.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/neutron/tests/unit/vmware/test_nsx_opts.py b/neutron/tests/unit/vmware/test_nsx_opts.py
index b2b7cf49a1b7af6ba1a075df10569784ea0c673c..a5f124e683f25b276ea1ad6daf757fa629752164 100644 (file)
--- a/neutron/tests/unit/vmware/test_nsx_opts.py
+++ b/neutron/tests/unit/vmware/test_nsx_opts.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 VMware, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/vmware/test_nsx_plugin.py b/neutron/tests/unit/vmware/test_nsx_plugin.py
index 2e9de71a2e1322aa17fe69b38b2c87bd6dc25065..ea0d13c5b9ed17f903f42502eebc3d9d0efec163 100644 (file)
--- a/neutron/tests/unit/vmware/test_nsx_plugin.py
+++ b/neutron/tests/unit/vmware/test_nsx_plugin.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 OpenStack Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/neutron/tests/unit/vmware/test_nsx_sync.py b/neutron/tests/unit/vmware/test_nsx_sync.py
index 1a89d0a6b3258c0a819f27823e34f46942c4bfe2..7dac024dc85410ca3d6a5d2dfda85250387ad442 100644 (file)
--- a/neutron/tests/unit/vmware/test_nsx_sync.py
+++ b/neutron/tests/unit/vmware/test_nsx_sync.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 VMware, Inc.
 # All Rights Reserved
 #

diff --git a/neutron/tests/unit/vmware/test_nsx_utils.py b/neutron/tests/unit/vmware/test_nsx_utils.py
index 79f1e031ed0f453467d8d7bf4e0af3394d09c47c..8f603f20e55250972a3b3dca64f6e54a08047995 100644 (file)
--- a/neutron/tests/unit/vmware/test_nsx_utils.py
+++ b/neutron/tests/unit/vmware/test_nsx_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/neutron/tests/unit/vmware/vshield/__init__.py b/neutron/tests/unit/vmware/vshield/__init__.py
index 5e8da711fb13c72b3051fe0d1152fca7f2aed653..a6a8955d8b30cd931e7f2d5027b1dfc9dabdc7e7 100644 (file)
--- a/neutron/tests/unit/vmware/vshield/__init__.py
+++ b/neutron/tests/unit/vmware/vshield/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/tests/unit/vmware/vshield/fake_vcns.py b/neutron/tests/unit/vmware/vshield/fake_vcns.py
index 5a5bfb1563b6735a8584487b802e7fcc7a11c700..052cf96c74f1d2e84287197f89210e18dabe6c59 100644 (file)
--- a/neutron/tests/unit/vmware/vshield/fake_vcns.py
+++ b/neutron/tests/unit/vmware/vshield/fake_vcns.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/vmware/vshield/test_edge_router.py b/neutron/tests/unit/vmware/vshield/test_edge_router.py
index b95a4a25dc95a92fa60958bf2de30934ce1b6bd8..64c31b8e6ad397d4221afa588e0bd3284e272472 100644 (file)
--- a/neutron/tests/unit/vmware/vshield/test_edge_router.py
+++ b/neutron/tests/unit/vmware/vshield/test_edge_router.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/neutron/tests/unit/vmware/vshield/test_firewall_driver.py b/neutron/tests/unit/vmware/vshield/test_firewall_driver.py
index 71e49bd42c90b932f7e12030b68c115aaab22fdd..edc41626998a4cb92d29313c42ea40f27417a42d 100644 (file)
--- a/neutron/tests/unit/vmware/vshield/test_firewall_driver.py
+++ b/neutron/tests/unit/vmware/vshield/test_firewall_driver.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/vmware/vshield/test_fwaas_plugin.py b/neutron/tests/unit/vmware/vshield/test_fwaas_plugin.py
index 7ce6fb915db4f29d82a836ca78a4cb1a342ae382..db9263af1bffd6897a85fa1865ef766617661267 100644 (file)
--- a/neutron/tests/unit/vmware/vshield/test_fwaas_plugin.py
+++ b/neutron/tests/unit/vmware/vshield/test_fwaas_plugin.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 VMware, Inc
 # All Rights Reserved
 #

diff --git a/neutron/tests/unit/vmware/vshield/test_lbaas_plugin.py b/neutron/tests/unit/vmware/vshield/test_lbaas_plugin.py
index f9a8a229667145a40072b72b46e27094d2144d72..becbde04b52c54b50ace99ed033ff1229ee3d672 100644 (file)
--- a/neutron/tests/unit/vmware/vshield/test_lbaas_plugin.py
+++ b/neutron/tests/unit/vmware/vshield/test_lbaas_plugin.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/vmware/vshield/test_loadbalancer_driver.py b/neutron/tests/unit/vmware/vshield/test_loadbalancer_driver.py
index 4cc2ea4b83cd38d743a57db32667059ed82ac4d4..2cfb7ca18240e039f05b221527ce98bce40225c8 100644 (file)
--- a/neutron/tests/unit/vmware/vshield/test_loadbalancer_driver.py
+++ b/neutron/tests/unit/vmware/vshield/test_loadbalancer_driver.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/tests/unit/vmware/vshield/test_vcns_driver.py b/neutron/tests/unit/vmware/vshield/test_vcns_driver.py
index ea889b7e765465d4abf16b08f0a5bf44b615915c..3d8ed1b85aa4b85edfdbf283ca7b293fc2e91d1a 100644 (file)
--- a/neutron/tests/unit/vmware/vshield/test_vcns_driver.py
+++ b/neutron/tests/unit/vmware/vshield/test_vcns_driver.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");