From 5660c9cc14aba7b5a9bd2812a12c94d3e221bf0d Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Tue, 18 Feb 2014 08:51:34 -0800 Subject: [PATCH] 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 --- neutron/agent/l3_agent.py | 6 +----- neutron/agent/linux/ovs_lib.py | 7 +------ neutron/common/__init__.py | 16 ---------------- neutron/common/config.py | 4 +--- neutron/common/exceptions.py | 4 +--- neutron/common/utils.py | 5 +---- neutron/db/__init__.py | 17 ----------------- neutron/db/allowedaddresspairs_db.py | 5 +---- neutron/db/api.py | 6 +----- neutron/db/l3_db.py | 7 +------ neutron/db/l3_gwmode_db.py | 6 +----- .../versions/4a666eb208c2_service_router.py | 4 +--- neutron/db/portsecurity_db.py | 6 +----- neutron/db/securitygroups_db.py | 6 +----- neutron/extensions/allowedaddresspairs.py | 6 +----- neutron/extensions/l3.py | 7 +------ neutron/extensions/l3_ext_gw_mode.py | 7 +------ neutron/extensions/portsecurity.py | 7 +------ neutron/manager.py | 5 +---- neutron/neutron_plugin_base_v2.py | 3 +-- neutron/plugins/midonet/plugin.py | 2 +- neutron/plugins/nec/agent/nec_neutron_agent.py | 4 +--- neutron/plugins/nicira/NeutronPlugin.py | 9 +-------- neutron/plugins/nicira/__init__.py | 16 ---------------- neutron/plugins/nicira/common/securitygroups.py | 6 +----- neutron/plugins/nicira/common/sync.py | 2 +- .../nicira/extensions/distributedrouter.py | 3 --- .../plugins/nicira/extensions/maclearning.py | 4 ---- neutron/plugins/nicira/extensions/nvp_qos.py | 2 -- neutron/plugins/nicira/nsx_cluster.py | 7 +------ neutron/plugins/nicira/nvplib.py | 9 +-------- .../openvswitch/agent/ovs_neutron_agent.py | 10 +--------- neutron/plugins/openvswitch/ovs_db_v2.py | 5 +---- neutron/plugins/openvswitch/ovs_models_v2.py | 5 +---- .../plugins/openvswitch/ovs_neutron_plugin.py | 10 +--------- neutron/plugins/ryu/agent/ryu_neutron_agent.py | 4 +--- neutron/server/__init__.py | 3 +-- neutron/service.py | 4 +--- neutron/tests/unit/openvswitch/test_ovs_lib.py | 5 +---- .../tests/unit/openvswitch/test_ovs_tunnel.py | 4 +--- neutron/tests/unit/test_agent_linux_utils.py | 5 +---- .../tests/unit/test_extension_ext_gw_mode.py | 6 +----- neutron/tests/unit/test_l3_agent.py | 4 +--- neutron/tests/unit/test_l3_plugin.py | 6 +----- neutron/tests/unit/test_neutron_context.py | 4 +--- neutron/tests/unit/vmware/apiclient/fake.py | 2 -- .../apiclient/test_api_eventlet_request.py | 2 -- neutron/tests/unit/vmware/db/test_nsx_db.py | 2 -- .../unit/vmware/extensions/test_maclearning.py | 2 -- neutron/tests/unit/vmware/nsxlib/base.py | 2 -- .../tests/unit/vmware/test_agent_scheduler.py | 2 -- neutron/tests/unit/vmware/test_nsx_opts.py | 2 -- neutron/tests/unit/vmware/test_nsx_plugin.py | 2 -- neutron/tests/unit/vmware/test_nsx_sync.py | 2 -- neutron/tests/unit/vmware/test_nsx_utils.py | 2 -- neutron/tests/unit/vmware/vshield/__init__.py | 2 -- neutron/tests/unit/vmware/vshield/fake_vcns.py | 2 -- .../unit/vmware/vshield/test_edge_router.py | 2 -- .../unit/vmware/vshield/test_firewall_driver.py | 2 -- .../unit/vmware/vshield/test_fwaas_plugin.py | 2 -- .../unit/vmware/vshield/test_lbaas_plugin.py | 2 -- .../vmware/vshield/test_loadbalancer_driver.py | 2 -- .../unit/vmware/vshield/test_vcns_driver.py | 2 -- 63 files changed, 39 insertions(+), 270 deletions(-) diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py index 424915cd4a..322a013d2e 100644 --- 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 8a1e6dd088..5f4675906d 100644 --- 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 7e695ff08d..e69de29bb2 100644 --- 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 fc7058a10d..3abddc50c4 100644 --- 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 1b23a52743..c7c57642d1 100644 --- 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 1a806ab495..488ef2dd93 100644 --- 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 620282b583..e69de29bb2 100644 --- 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 e28576ef3e..8adf47bc67 100644 --- 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 1e05361fac..85bd42821a 100644 --- 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 ea9d7a175e..4bb6980e14 100644 --- 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 a53ee71df4..4c184019f8 100644 --- 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 1d22a9e42f..ad3356b45d 100644 --- 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 cefe85fb66..d01eecd24b 100644 --- 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 2a7d2ef035..882a43d625 100644 --- 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 fa089ba535..96512f327a 100644 --- 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 7ab7d66b16..74d10389ba 100644 --- 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 0de20110d7..31c943a9c8 100644 --- 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 fb3a2b555a..b652436ed8 100644 --- 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 eda835d3ca..9e5ef19677 100644 --- 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 43b99f5da8..603f23e6df 100644 --- 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 2977b9b3dd..c7190b402d 100644 --- 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 93766ab6bc..1006d390a2 100755 --- 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 -# 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 4a9568b83b..ec47329c66 100644 --- 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 07dd0007e2..e69de29bb2 100644 --- 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 8efc476e7d..d0b71c0374 100644 --- 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 d44997dfc1..a7eb25f236 100644 --- 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 4e5ed1af1c..aa6949b826 100644 --- 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 a3b3a9faad..21c6691508 100644 --- 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 75a9d4dc01..1a16d32804 100644 --- 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 b2bf35f8e7..7dc9f85897 100644 --- 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 f814979ae7..5d72a886be 100644 --- 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 ed67a67dae..ec9f5be132 100644 --- 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 sys diff --git a/neutron/plugins/openvswitch/ovs_db_v2.py b/neutron/plugins/openvswitch/ovs_db_v2.py index 821163d80a..c65ffa0d80 100644 --- 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 ab334c318e..ffb6cd0b8c 100644 --- 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 55b7827b9f..7f190b9451 100644 --- 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 dddbe15cb3..6f261bfec2 100755 --- 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 # 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 a31cdbe403..8c3ebc66c6 100755 --- 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 d0c2d7eaa2..2444baca89 100644 --- 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 0035a7f34a..ff2768b9b1 100644 --- 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 63c4b455d7..f6abc5c65e 100644 --- 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 6b7fbbfd00..b0904c3ff2 100644 --- 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 dc7a7eb4a4..4e1aa9d5ef 100644 --- 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 9fb0e6dfb4..f4a32ecb17 100644 --- 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 f261dfb6e9..f3669009fc 100644 --- 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 5a36c850e0..937e29666e 100644 --- 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 ce7cb316bd..9ceb72993b 100644 --- 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 f0c6f9e42f..833b140d97 100644 --- 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 61ba452d6e..e6882f61f2 100644 --- 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 d664bf3f08..06a86f7894 100644 --- 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 7956c897d5..b88e014b60 100644 --- 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 2347cd6f04..d4bf97d250 100644 --- 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 b2b7cf49a1..a5f124e683 100644 --- 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 2e9de71a2e..ea0d13c5b9 100644 --- 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 1a89d0a6b3..7dac024dc8 100644 --- 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 79f1e031ed..8f603f20e5 100644 --- 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 5e8da711fb..a6a8955d8b 100644 --- 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 5a5bfb1563..052cf96c74 100644 --- 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 b95a4a25dc..64c31b8e6a 100644 --- 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 71e49bd42c..edc4162699 100644 --- 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 7ce6fb915d..db9263af1b 100644 --- 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 f9a8a22966..becbde04b5 100644 --- 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 4cc2ea4b83..2cfb7ca182 100644 --- 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 ea889b7e76..3d8ed1b85a 100644 --- 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");