From 74f953a1d7cc660696f9fda83e13fe2f2bbae7b2 Mon Sep 17 00:00:00 2001 From: liu-sheng Date: Mon, 27 Jan 2014 10:38:08 +0800 Subject: [PATCH] Remove vi modelines We don't need to have the vi modelines in each source file, it can be set in a user's vimrc if required. Also a check is added to hacking to detect if they are re-added. Change-Id: I347307a5145b2760c69085b6ca850d6a9137ffc6 Closes-Bug: #1229324 --- HACKING.rst | 1 + contrib/xen/vif-openstack | 1 - nova/__init__.py | 2 -- nova/api/auth.py | 2 -- nova/api/ec2/__init__.py | 2 -- nova/api/ec2/apirequest.py | 2 -- nova/api/ec2/cloud.py | 2 -- nova/api/ec2/ec2utils.py | 2 -- nova/api/ec2/faults.py | 2 -- nova/api/ec2/inst_state.py | 2 -- nova/api/manager.py | 2 -- nova/api/metadata/__init__.py | 2 -- nova/api/metadata/base.py | 2 -- nova/api/metadata/handler.py | 2 -- nova/api/metadata/vendordata_json.py | 2 -- nova/api/openstack/__init__.py | 2 -- nova/api/openstack/auth.py | 2 -- nova/api/openstack/common.py | 2 -- nova/api/openstack/compute/__init__.py | 2 -- nova/api/openstack/compute/consoles.py | 2 -- nova/api/openstack/compute/contrib/__init__.py | 2 -- nova/api/openstack/compute/contrib/agents.py | 2 -- .../compute/contrib/availability_zone.py | 2 -- .../compute/contrib/baremetal_ext_status.py | 2 -- .../openstack/compute/contrib/cell_capacities.py | 2 -- nova/api/openstack/compute/contrib/cells.py | 2 -- .../openstack/compute/contrib/certificates.py | 2 -- .../compute/contrib/cloudpipe_update.py | 2 -- .../openstack/compute/contrib/config_drive.py | 2 -- .../openstack/compute/contrib/console_output.py | 2 -- nova/api/openstack/compute/contrib/consoles.py | 2 -- .../openstack/compute/contrib/createserverext.py | 2 -- .../api/openstack/compute/contrib/disk_config.py | 2 -- .../contrib/extended_availability_zone.py | 2 -- .../compute/contrib/extended_floating_ips.py | 2 -- .../compute/contrib/extended_ips_mac.py | 2 -- .../contrib/extended_virtual_interfaces_net.py | 2 -- .../compute/contrib/extended_volumes.py | 2 -- nova/api/openstack/compute/contrib/fixed_ips.py | 2 -- .../openstack/compute/contrib/flavor_access.py | 2 -- .../openstack/compute/contrib/flavorextradata.py | 2 -- .../compute/contrib/flavorextraspecs.py | 2 -- .../openstack/compute/contrib/flavormanage.py | 2 -- .../openstack/compute/contrib/floating_ip_dns.py | 2 -- .../compute/contrib/floating_ip_pools.py | 2 -- .../openstack/compute/contrib/floating_ips.py | 2 -- .../compute/contrib/floating_ips_bulk.py | 2 -- nova/api/openstack/compute/contrib/fping.py | 2 -- .../compute/contrib/instance_usage_audit_log.py | 2 -- nova/api/openstack/compute/contrib/keypairs.py | 2 -- nova/api/openstack/compute/contrib/migrations.py | 2 -- .../openstack/compute/contrib/multiple_create.py | 2 -- .../api/openstack/compute/contrib/os_networks.py | 2 -- .../compute/contrib/os_tenant_networks.py | 2 -- nova/api/openstack/compute/contrib/quotas.py | 2 -- .../openstack/compute/contrib/scheduler_hints.py | 2 -- .../contrib/security_group_default_rules.py | 2 -- .../openstack/compute/contrib/server_password.py | 2 -- .../compute/contrib/server_start_stop.py | 2 -- nova/api/openstack/compute/contrib/services.py | 2 -- .../compute/contrib/simple_tenant_usage.py | 2 -- .../api/openstack/compute/contrib/used_limits.py | 2 -- .../compute/contrib/used_limits_for_admin.py | 2 -- nova/api/openstack/compute/contrib/user_data.py | 2 -- nova/api/openstack/compute/extensions.py | 2 -- nova/api/openstack/compute/flavors.py | 2 -- nova/api/openstack/compute/image_metadata.py | 2 -- nova/api/openstack/compute/ips.py | 2 -- nova/api/openstack/compute/plugins/__init__.py | 2 -- .../openstack/compute/plugins/v3/access_ips.py | 2 -- .../compute/plugins/v3/admin_password.py | 2 -- nova/api/openstack/compute/plugins/v3/agents.py | 2 -- .../compute/plugins/v3/availability_zone.py | 2 -- .../compute/plugins/v3/block_device_mapping.py | 2 -- nova/api/openstack/compute/plugins/v3/cells.py | 2 -- .../openstack/compute/plugins/v3/certificates.py | 2 -- .../openstack/compute/plugins/v3/config_drive.py | 2 -- .../compute/plugins/v3/console_output.py | 2 -- .../api/openstack/compute/plugins/v3/consoles.py | 2 -- .../plugins/v3/extended_availability_zone.py | 2 -- .../compute/plugins/v3/extended_volumes.py | 2 -- .../compute/plugins/v3/extension_info.py | 2 -- .../compute/plugins/v3/flavor_access.py | 2 -- .../compute/plugins/v3/flavor_manage.py | 2 -- nova/api/openstack/compute/plugins/v3/flavors.py | 2 -- .../compute/plugins/v3/flavors_extraspecs.py | 2 -- .../plugins/v3/instance_usage_audit_log.py | 2 -- nova/api/openstack/compute/plugins/v3/ips.py | 2 -- .../api/openstack/compute/plugins/v3/keypairs.py | 2 -- .../openstack/compute/plugins/v3/migrations.py | 2 -- .../compute/plugins/v3/multiple_create.py | 2 -- nova/api/openstack/compute/plugins/v3/pci.py | 2 -- .../openstack/compute/plugins/v3/quota_sets.py | 2 -- .../compute/plugins/v3/remote_consoles.py | 2 -- .../compute/plugins/v3/scheduler_hints.py | 2 -- .../compute/plugins/v3/server_metadata.py | 2 -- .../compute/plugins/v3/server_password.py | 2 -- .../api/openstack/compute/plugins/v3/services.py | 2 -- .../compute/plugins/v3/simple_tenant_usage.py | 2 -- .../openstack/compute/plugins/v3/user_data.py | 2 -- .../api/openstack/compute/plugins/v3/versions.py | 2 -- .../compute/schemas/v3/admin_password_schema.py | 2 -- .../compute/schemas/v3/agents_schema.py | 2 -- .../schemas/v3/extended_volumes_schema.py | 2 -- .../compute/schemas/v3/flavor_access_schema.py | 2 -- .../compute/schemas/v3/keypairs_schema.py | 2 -- nova/api/openstack/compute/server_metadata.py | 2 -- nova/api/openstack/compute/versions.py | 2 -- nova/api/openstack/compute/views/addresses.py | 2 -- nova/api/openstack/compute/views/flavors.py | 2 -- nova/api/openstack/compute/views/images.py | 2 -- nova/api/openstack/compute/views/limits.py | 2 -- nova/api/openstack/compute/views/servers.py | 2 -- nova/api/openstack/compute/views/versions.py | 2 -- nova/api/openstack/extensions.py | 2 -- nova/api/openstack/urlmap.py | 2 -- nova/api/openstack/wsgi.py | 2 -- nova/api/openstack/xmlutil.py | 2 -- nova/api/sizelimit.py | 2 -- nova/api/validation/__init__.py | 2 -- nova/api/validation/validators.py | 2 -- nova/api/validator.py | 2 -- nova/block_device.py | 2 -- nova/cells/__init__.py | 2 -- nova/cells/opts.py | 2 -- nova/cert/__init__.py | 2 -- nova/cert/manager.py | 2 -- nova/cert/rpcapi.py | 2 -- nova/cloudpipe/__init__.py | 2 -- nova/cloudpipe/bootscript.template | 2 -- nova/cloudpipe/client.ovpn.template | 2 -- nova/cloudpipe/pipelib.py | 2 -- nova/cmd/all.py | 2 -- nova/cmd/api.py | 2 -- nova/cmd/api_ec2.py | 2 -- nova/cmd/api_metadata.py | 2 -- nova/cmd/api_os_compute.py | 2 -- nova/cmd/baremetal_deploy_helper.py | 2 -- nova/cmd/baremetal_manage.py | 2 -- nova/cmd/cells.py | 2 -- nova/cmd/cert.py | 2 -- nova/cmd/compute.py | 2 -- nova/cmd/conductor.py | 2 -- nova/cmd/console.py | 2 -- nova/cmd/consoleauth.py | 2 -- nova/cmd/dhcpbridge.py | 2 -- nova/cmd/manage.py | 2 -- nova/cmd/network.py | 2 -- nova/cmd/novnc.py | 2 -- nova/cmd/novncproxy.py | 2 -- nova/cmd/objectstore.py | 2 -- nova/cmd/scheduler.py | 2 -- nova/cmd/spicehtml5proxy.py | 2 -- nova/cmd/xvpvncproxy.py | 2 -- nova/compute/__init__.py | 2 -- nova/compute/api.py | 2 -- nova/compute/flavors.py | 2 -- nova/compute/instance_actions.py | 2 -- nova/compute/manager.py | 2 -- nova/compute/power_state.py | 2 -- nova/compute/rpcapi.py | 2 -- nova/compute/task_states.py | 2 -- nova/compute/utils.py | 2 -- nova/compute/vm_mode.py | 2 -- nova/compute/vm_states.py | 2 -- nova/conductor/tasks/live_migrate.py | 2 -- nova/config.py | 2 -- nova/console/__init__.py | 2 -- nova/console/api.py | 2 -- nova/console/fake.py | 2 -- nova/console/manager.py | 2 -- nova/console/rpcapi.py | 2 -- nova/console/vmrc.py | 2 -- nova/console/vmrc_manager.py | 2 -- nova/console/websocketproxy.py | 2 -- nova/console/xvp.py | 2 -- nova/consoleauth/__init__.py | 2 -- nova/consoleauth/manager.py | 2 -- nova/consoleauth/rpcapi.py | 2 -- nova/context.py | 2 -- nova/crypto.py | 2 -- nova/db/__init__.py | 3 --- nova/db/api.py | 2 -- nova/db/base.py | 2 -- nova/db/migration.py | 2 -- nova/db/sqlalchemy/__init__.py | 2 -- nova/db/sqlalchemy/api.py | 2 -- nova/db/sqlalchemy/migrate_repo/__init__.py | 2 -- nova/db/sqlalchemy/migrate_repo/manage.py | 2 -- .../migrate_repo/versions/216_havana.py | 2 -- .../versions/228_add_metrics_in_compute_nodes.py | 2 -- .../sqlalchemy/migrate_repo/versions/__init__.py | 2 -- nova/db/sqlalchemy/migration.py | 2 -- nova/db/sqlalchemy/models.py | 2 -- nova/db/sqlalchemy/types.py | 2 -- nova/db/sqlalchemy/utils.py | 2 -- nova/exception.py | 2 -- nova/hacking/checks.py | 16 ++++++++++++++++ nova/hooks.py | 2 -- nova/image/download/__init__.py | 2 -- nova/image/download/base.py | 2 -- nova/image/download/file.py | 2 -- nova/image/glance.py | 2 -- nova/image/s3.py | 2 -- nova/ipv6/__init__.py | 2 -- nova/ipv6/account_identifier.py | 2 -- nova/ipv6/api.py | 2 -- nova/ipv6/rfc2462.py | 2 -- nova/keymgr/__init__.py | 1 - nova/keymgr/conf_key_mgr.py | 1 - nova/keymgr/key.py | 2 -- nova/keymgr/key_mgr.py | 1 - nova/keymgr/mock_key_mgr.py | 1 - nova/keymgr/not_implemented_key_mgr.py | 1 - nova/keymgr/single_key_mgr.py | 1 - nova/manager.py | 2 -- nova/netconf.py | 2 -- nova/network/__init__.py | 2 -- nova/network/api.py | 2 -- nova/network/driver.py | 2 -- nova/network/floating_ips.py | 2 -- nova/network/l3.py | 2 -- nova/network/linux_net.py | 2 -- nova/network/manager.py | 2 -- nova/network/model.py | 2 -- nova/network/neutronv2/__init__.py | 2 -- nova/network/neutronv2/api.py | 1 - nova/network/neutronv2/constants.py | 2 -- nova/network/noop_dns_driver.py | 2 -- nova/network/nova_ipam_lib.py | 2 -- nova/network/rpcapi.py | 2 -- nova/network/security_group/__init__.py | 2 -- nova/network/security_group/neutron_driver.py | 2 -- nova/network/security_group/openstack_driver.py | 2 -- .../security_group/security_group_base.py | 2 -- nova/notifications.py | 2 -- nova/objects/instance_group.py | 2 -- nova/objects/pci_device.py | 2 -- nova/objectstore/__init__.py | 2 -- nova/objectstore/s3server.py | 2 -- nova/openstack/common/log_handler.py | 2 -- nova/openstack/common/uuidutils.py | 2 -- nova/paths.py | 2 -- nova/pci/pci_manager.py | 2 -- nova/pci/pci_request.py | 2 -- nova/pci/pci_stats.py | 2 -- nova/pci/pci_utils.py | 2 -- nova/pci/pci_whitelist.py | 2 -- nova/policy.py | 2 -- nova/quota.py | 2 -- nova/rpc.py | 2 -- nova/safe_utils.py | 2 -- nova/scheduler/__init__.py | 2 -- nova/scheduler/chance.py | 2 -- nova/scheduler/driver.py | 2 -- nova/scheduler/filters/pci_passthrough_filter.py | 2 -- nova/scheduler/filters/trusted_filter.py | 2 -- nova/scheduler/manager.py | 2 -- nova/scheduler/rpcapi.py | 2 -- nova/scheduler/scheduler_options.py | 2 -- nova/service.py | 2 -- nova/spice/__init__.py | 2 -- nova/storage/__init__.py | 2 -- nova/storage/linuxscsi.py | 2 -- nova/test.py | 2 -- nova/tests/__init__.py | 2 -- nova/tests/api/__init__.py | 2 -- nova/tests/api/ec2/__init__.py | 2 -- nova/tests/api/ec2/test_api.py | 2 -- nova/tests/api/ec2/test_cinder_cloud.py | 2 -- nova/tests/api/ec2/test_cloud.py | 2 -- nova/tests/api/ec2/test_ec2_validate.py | 2 -- nova/tests/api/ec2/test_faults.py | 2 -- nova/tests/api/ec2/test_middleware.py | 2 -- nova/tests/api/openstack/__init__.py | 2 -- nova/tests/api/openstack/common.py | 2 -- nova/tests/api/openstack/compute/__init__.py | 2 -- .../api/openstack/compute/contrib/__init__.py | 2 -- .../compute/contrib/test_createserverext.py | 2 -- .../compute/contrib/test_deferred_delete.py | 2 -- .../compute/contrib/test_disk_config.py | 2 -- .../compute/contrib/test_extended_ips_mac.py | 2 -- .../test_extended_virtual_interfaces_net.py | 2 -- .../compute/contrib/test_flavors_extra_specs.py | 2 -- .../openstack/compute/contrib/test_migrations.py | 2 -- .../contrib/test_neutron_security_groups.py | 2 -- .../api/openstack/compute/contrib/test_quotas.py | 2 -- .../compute/contrib/test_scheduler_hints.py | 2 -- .../contrib/test_security_group_default_rules.py | 2 -- .../compute/contrib/test_security_groups.py | 2 -- .../compute/contrib/test_simple_tenant_usage.py | 2 -- .../compute/contrib/test_used_limits.py | 2 -- .../api/openstack/compute/extensions/__init__.py | 2 -- .../openstack/compute/extensions/foxinsocks.py | 2 -- .../compute/plugins/v3/test_admin_password.py | 2 -- .../plugins/v3/test_block_device_mapping.py | 2 -- .../compute/plugins/v3/test_consoles.py | 2 -- .../compute/plugins/v3/test_deferred_delete.py | 2 -- .../compute/plugins/v3/test_extended_volumes.py | 2 -- .../compute/plugins/v3/test_extension_info.py | 2 -- .../openstack/compute/plugins/v3/test_flavors.py | 2 -- .../plugins/v3/test_flavors_extra_specs.py | 2 -- .../compute/plugins/v3/test_keypairs.py | 2 -- .../compute/plugins/v3/test_migrations.py | 2 -- .../compute/plugins/v3/test_multiple_create.py | 2 -- .../api/openstack/compute/plugins/v3/test_pci.py | 2 -- .../compute/plugins/v3/test_quota_sets.py | 2 -- .../compute/plugins/v3/test_scheduler_hints.py | 2 -- .../compute/plugins/v3/test_security_groups.py | 2 -- .../compute/plugins/v3/test_server_metadata.py | 2 -- .../openstack/compute/plugins/v3/test_servers.py | 2 -- .../plugins/v3/test_simple_tenant_usage.py | 2 -- .../compute/plugins/v3/test_versions.py | 2 -- nova/tests/api/openstack/compute/test_api.py | 2 -- nova/tests/api/openstack/compute/test_auth.py | 2 -- .../tests/api/openstack/compute/test_consoles.py | 2 -- .../api/openstack/compute/test_extensions.py | 2 -- nova/tests/api/openstack/compute/test_flavors.py | 2 -- .../api/openstack/compute/test_image_metadata.py | 2 -- nova/tests/api/openstack/compute/test_images.py | 2 -- .../openstack/compute/test_server_metadata.py | 2 -- nova/tests/api/openstack/compute/test_servers.py | 2 -- nova/tests/api/openstack/compute/test_v3_auth.py | 2 -- .../api/openstack/compute/test_v3_extensions.py | 2 -- .../tests/api/openstack/compute/test_versions.py | 2 -- nova/tests/api/openstack/fakes.py | 2 -- nova/tests/api/openstack/test_common.py | 2 -- nova/tests/api/openstack/test_faults.py | 2 -- nova/tests/api/openstack/test_mapper.py | 2 -- nova/tests/api/openstack/test_wsgi.py | 2 -- nova/tests/api/openstack/test_xmlutil.py | 2 -- nova/tests/api/test_validator.py | 2 -- nova/tests/api/test_wsgi.py | 2 -- nova/tests/cast_as_call.py | 2 -- nova/tests/cells/__init__.py | 2 -- nova/tests/cert/__init__.py | 2 -- nova/tests/cert/test_rpcapi.py | 2 -- nova/tests/compute/__init__.py | 2 -- nova/tests/compute/fake_resource_tracker.py | 2 -- nova/tests/compute/monitors/test_cpu_monitor.py | 2 -- nova/tests/compute/monitors/test_monitors.py | 2 -- nova/tests/compute/test_claims.py | 2 -- nova/tests/compute/test_compute.py | 2 -- nova/tests/compute/test_compute_cells.py | 1 - nova/tests/compute/test_compute_utils.py | 2 -- nova/tests/compute/test_keypairs.py | 2 -- nova/tests/compute/test_multiple_nodes.py | 2 -- nova/tests/compute/test_resource_tracker.py | 2 -- nova/tests/compute/test_rpcapi.py | 2 -- nova/tests/compute/test_stats.py | 2 -- nova/tests/compute/test_virtapi.py | 2 -- nova/tests/compute/test_vmmode.py | 2 -- nova/tests/conductor/tasks/test_live_migrate.py | 2 -- nova/tests/conf_fixture.py | 2 -- nova/tests/console/__init__.py | 2 -- nova/tests/console/test_console.py | 2 -- nova/tests/console/test_rpcapi.py | 2 -- nova/tests/consoleauth/__init__.py | 2 -- nova/tests/consoleauth/test_consoleauth.py | 2 -- nova/tests/consoleauth/test_rpcapi.py | 2 -- nova/tests/db/__init__.py | 2 -- nova/tests/db/fakes.py | 2 -- nova/tests/db/test_db_api.py | 1 - nova/tests/db/test_migration_utils.py | 2 -- nova/tests/db/test_migrations.py | 2 -- nova/tests/db/test_sqlalchemy_utils.py | 2 -- nova/tests/db/test_sqlite.py | 2 -- nova/tests/fake_crypto.py | 2 -- nova/tests/fake_instance_actions.py | 2 -- nova/tests/fake_ldap.py | 2 -- nova/tests/fake_network.py | 2 -- nova/tests/fake_network_cache_model.py | 2 -- nova/tests/fake_notifier.py | 2 -- nova/tests/fake_policy.py | 2 -- nova/tests/fake_processutils.py | 2 -- nova/tests/fake_volume.py | 2 -- nova/tests/fakeguestfs.py | 2 -- nova/tests/glance/__init__.py | 2 -- nova/tests/glance/stubs.py | 2 -- nova/tests/image/__init__.py | 2 -- nova/tests/image/fake.py | 2 -- nova/tests/image/test_fake.py | 2 -- nova/tests/image/test_glance.py | 2 -- nova/tests/image/test_s3.py | 2 -- nova/tests/integrated/__init__.py | 2 -- nova/tests/integrated/api/__init__.py | 2 -- nova/tests/integrated/api/client.py | 2 -- nova/tests/integrated/api_samples_test_base.py | 1 - nova/tests/integrated/integrated_helpers.py | 2 -- nova/tests/integrated/test_api_samples.py | 1 - nova/tests/integrated/test_extensions.py | 2 -- nova/tests/integrated/test_login.py | 2 -- nova/tests/integrated/test_servers.py | 2 -- nova/tests/integrated/test_xml.py | 2 -- nova/tests/integrated/v3/api_sample_base.py | 1 - nova/tests/integrated/v3/test_access_ips.py | 1 - nova/tests/integrated/v3/test_admin_actions.py | 1 - nova/tests/integrated/v3/test_admin_password.py | 1 - nova/tests/integrated/v3/test_agents.py | 1 - nova/tests/integrated/v3/test_aggregates.py | 1 - .../integrated/v3/test_attach_interfaces.py | 1 - .../integrated/v3/test_availability_zone.py | 1 - nova/tests/integrated/v3/test_cells.py | 1 - nova/tests/integrated/v3/test_certificates.py | 1 - nova/tests/integrated/v3/test_console_output.py | 1 - nova/tests/integrated/v3/test_consoles.py | 1 - nova/tests/integrated/v3/test_deferred_delete.py | 1 - nova/tests/integrated/v3/test_evacuate.py | 1 - .../v3/test_extended_availability_zone.py | 1 - .../v3/test_extended_server_attributes.py | 1 - nova/tests/integrated/v3/test_extended_status.py | 1 - .../tests/integrated/v3/test_extended_volumes.py | 1 - nova/tests/integrated/v3/test_extension_info.py | 1 - nova/tests/integrated/v3/test_flavor_access.py | 1 - .../integrated/v3/test_flavor_extraspecs.py | 1 - nova/tests/integrated/v3/test_flavor_manage.py | 1 - nova/tests/integrated/v3/test_flavor_rxtx.py | 1 - nova/tests/integrated/v3/test_flavors.py | 1 - .../integrated/v3/test_hide_server_addresses.py | 1 - nova/tests/integrated/v3/test_hosts.py | 1 - nova/tests/integrated/v3/test_hypervisors.py | 1 - .../tests/integrated/v3/test_instance_actions.py | 1 - .../v3/test_instance_usage_audit_log.py | 1 - nova/tests/integrated/v3/test_keypairs.py | 1 - nova/tests/integrated/v3/test_migrations.py | 1 - nova/tests/integrated/v3/test_multinic.py | 1 - nova/tests/integrated/v3/test_pci.py | 1 - .../tests/integrated/v3/test_quota_class_sets.py | 1 - nova/tests/integrated/v3/test_quota_sets.py | 1 - nova/tests/integrated/v3/test_remote_consoles.py | 1 - nova/tests/integrated/v3/test_rescue.py | 1 - nova/tests/integrated/v3/test_scheduler_hints.py | 1 - nova/tests/integrated/v3/test_security_groups.py | 1 - .../integrated/v3/test_server_diagnostics.py | 1 - nova/tests/integrated/v3/test_server_metadata.py | 1 - nova/tests/integrated/v3/test_server_usage.py | 1 - nova/tests/integrated/v3/test_servers.py | 1 - nova/tests/integrated/v3/test_servers_ips.py | 1 - nova/tests/integrated/v3/test_services.py | 1 - nova/tests/integrated/v3/test_shelve.py | 1 - .../integrated/v3/test_simple_tenant_usage.py | 1 - nova/tests/integrated/v3/test_user_data.py | 1 - nova/tests/keymgr/__init__.py | 1 - nova/tests/keymgr/fake.py | 2 -- nova/tests/keymgr/test_conf_key_mgr.py | 1 - nova/tests/keymgr/test_key.py | 2 -- nova/tests/keymgr/test_key_mgr.py | 2 -- nova/tests/keymgr/test_mock_key_mgr.py | 1 - .../tests/keymgr/test_not_implemented_key_mgr.py | 1 - nova/tests/keymgr/test_single_key_mgr.py | 1 - nova/tests/matchers.py | 2 -- nova/tests/monkey_patch_example/__init__.py | 2 -- nova/tests/monkey_patch_example/example_a.py | 2 -- nova/tests/monkey_patch_example/example_b.py | 2 -- nova/tests/network/__init__.py | 2 -- .../security_group/test_neutron_driver.py | 2 -- nova/tests/network/test_api.py | 2 -- nova/tests/network/test_ipam_lib.py | 2 -- nova/tests/network/test_linux_net.py | 2 -- nova/tests/network/test_manager.py | 2 -- nova/tests/network/test_network_info.py | 2 -- nova/tests/network/test_neutronv2.py | 2 -- nova/tests/network/test_rpcapi.py | 2 -- nova/tests/objects/test_instance_group.py | 2 -- nova/tests/objects/test_pci_device.py | 2 -- nova/tests/pci/test_pci_manager.py | 2 -- nova/tests/pci/test_pci_request.py | 2 -- nova/tests/pci/test_pci_stats.py | 2 -- nova/tests/pci/test_pci_utils.py | 2 -- nova/tests/pci/test_pci_whitelist.py | 2 -- nova/tests/scheduler/__init__.py | 2 -- nova/tests/scheduler/test_chance_scheduler.py | 2 -- nova/tests/scheduler/test_rpcapi.py | 2 -- nova/tests/scheduler/test_scheduler.py | 2 -- nova/tests/test_api_validation.py | 2 -- nova/tests/test_availability_zones.py | 2 -- nova/tests/test_bdm.py | 2 -- nova/tests/test_block_device.py | 2 -- nova/tests/test_cinder.py | 2 -- nova/tests/test_configdrive2.py | 2 -- nova/tests/test_context.py | 2 -- nova/tests/test_exception.py | 2 -- nova/tests/test_flavors.py | 2 -- nova/tests/test_hooks.py | 2 -- nova/tests/test_instance_types_extra_specs.py | 2 -- nova/tests/test_iptables_network.py | 2 -- nova/tests/test_ipv6.py | 2 -- nova/tests/test_linuxscsi.py | 2 -- nova/tests/test_matchers.py | 2 -- nova/tests/test_metadata.py | 2 -- nova/tests/test_notifications.py | 2 -- nova/tests/test_nova_manage.py | 2 -- nova/tests/test_objectstore.py | 2 -- nova/tests/test_policy.py | 2 -- nova/tests/test_quota.py | 2 -- nova/tests/test_safeutils.py | 2 -- nova/tests/test_service.py | 2 -- nova/tests/test_test.py | 2 -- nova/tests/test_test_utils.py | 2 -- nova/tests/test_utils.py | 2 -- nova/tests/test_versions.py | 2 -- nova/tests/test_wsgi.py | 2 -- nova/tests/utils.py | 2 -- nova/tests/virt/baremetal/test_driver.py | 1 - nova/tests/virt/baremetal/test_iboot_pdu.py | 2 -- nova/tests/virt/baremetal/test_ipmi.py | 1 - .../test_nova_baremetal_deploy_helper.py | 2 -- .../virt/baremetal/test_nova_baremetal_manage.py | 2 -- nova/tests/virt/baremetal/test_pxe.py | 1 - nova/tests/virt/baremetal/test_tilera.py | 1 - nova/tests/virt/baremetal/test_tilera_pdu.py | 1 - nova/tests/virt/baremetal/test_utils.py | 1 - .../virt/baremetal/test_virtual_power_driver.py | 1 - nova/tests/virt/disk/__init__.py | 2 -- nova/tests/virt/disk/test_api.py | 2 -- nova/tests/virt/disk/test_loop.py | 2 -- nova/tests/virt/disk/test_nbd.py | 2 -- nova/tests/virt/docker/mock_client.py | 2 -- nova/tests/virt/docker/test_docker_client.py | 2 -- nova/tests/virt/docker/test_driver.py | 2 -- nova/tests/virt/docker/test_hostinfo.py | 2 -- nova/tests/virt/docker/test_network.py | 2 -- nova/tests/virt/hyperv/__init__.py | 2 -- nova/tests/virt/hyperv/db_fakes.py | 2 -- nova/tests/virt/hyperv/fake.py | 2 -- nova/tests/virt/hyperv/test_hypervapi.py | 2 -- nova/tests/virt/hyperv/test_networkutilsv2.py | 2 -- nova/tests/virt/hyperv/test_vhdutils.py | 2 -- nova/tests/virt/hyperv/test_vhdutilsv2.py | 2 -- nova/tests/virt/hyperv/test_vmutils.py | 2 -- nova/tests/virt/hyperv/test_vmutilsv2.py | 2 -- nova/tests/virt/libvirt/__init__.py | 2 -- nova/tests/virt/libvirt/fake_imagebackend.py | 2 -- nova/tests/virt/libvirt/fake_libvirt_utils.py | 2 -- nova/tests/virt/libvirt/fakelibvirt.py | 2 -- nova/tests/virt/libvirt/test_fakelibvirt.py | 2 -- nova/tests/virt/libvirt/test_image_utils.py | 2 -- nova/tests/virt/libvirt/test_imagebackend.py | 2 -- nova/tests/virt/libvirt/test_imagecache.py | 2 -- nova/tests/virt/libvirt/test_libvirt.py | 2 -- .../tests/virt/libvirt/test_libvirt_blockinfo.py | 2 -- nova/tests/virt/libvirt/test_libvirt_config.py | 2 -- nova/tests/virt/libvirt/test_libvirt_utils.py | 2 -- nova/tests/virt/libvirt/test_libvirt_vif.py | 2 -- nova/tests/virt/libvirt/test_libvirt_volume.py | 2 -- nova/tests/virt/test_block_device.py | 2 -- nova/tests/virt/test_cpu.py | 2 -- nova/tests/virt/test_driver.py | 2 -- nova/tests/virt/test_virt.py | 2 -- nova/tests/virt/test_virt_disk.py | 2 -- nova/tests/virt/test_virt_disk_vfs_guestfs.py | 2 -- nova/tests/virt/test_virt_disk_vfs_localfs.py | 2 -- nova/tests/virt/test_virt_drivers.py | 2 -- nova/tests/virt/vmwareapi/__init__.py | 2 -- nova/tests/virt/vmwareapi/db_fakes.py | 2 -- nova/tests/virt/vmwareapi/stubs.py | 2 -- nova/tests/virt/vmwareapi/test_configdrive.py | 2 -- nova/tests/virt/vmwareapi/test_driver_api.py | 2 -- nova/tests/virt/vmwareapi/test_error_util.py | 2 -- .../tests/virt/vmwareapi/test_read_write_util.py | 2 -- nova/tests/virt/vmwareapi/test_vif.py | 2 -- nova/tests/virt/vmwareapi/test_vim_util.py | 2 -- nova/tests/virt/vmwareapi/test_vm_util.py | 2 -- .../test_vm_util_datastore_selection.py | 2 -- nova/tests/virt/vmwareapi/test_vmops.py | 2 -- nova/tests/virt/vmwareapi/test_volumeops.py | 2 -- nova/tests/virt/xenapi/image/test_bittorrent.py | 2 -- nova/tests/virt/xenapi/image/test_glance.py | 2 -- nova/tests/virt/xenapi/image/test_utils.py | 2 -- .../virt/xenapi/image/test_vdi_through_dev.py | 2 -- nova/tests/virt/xenapi/stubs.py | 2 -- nova/tests/virt/xenapi/test_agent.py | 2 -- nova/tests/virt/xenapi/test_driver.py | 2 -- nova/tests/virt/xenapi/test_vm_utils.py | 2 -- nova/tests/virt/xenapi/test_vmops.py | 2 -- nova/tests/virt/xenapi/test_volume_utils.py | 2 -- nova/tests/virt/xenapi/test_volumeops.py | 2 -- nova/tests/virt/xenapi/test_xenapi.py | 2 -- nova/tests/volume/encryptors/__init__.py | 2 -- nova/tests/volume/encryptors/test_base.py | 2 -- nova/tests/volume/encryptors/test_cryptsetup.py | 2 -- nova/tests/volume/encryptors/test_luks.py | 2 -- nova/tests/volume/encryptors/test_nop.py | 2 -- nova/tests/volume/test_cinder.py | 2 -- nova/utils.py | 2 -- nova/version.py | 2 -- nova/virt/__init__.py | 2 -- nova/virt/baremetal/baremetal_states.py | 2 -- nova/virt/baremetal/base.py | 2 -- nova/virt/baremetal/common.py | 2 -- nova/virt/baremetal/db/api.py | 2 -- nova/virt/baremetal/db/migration.py | 2 -- nova/virt/baremetal/db/sqlalchemy/api.py | 2 -- .../sqlalchemy/migrate_repo/versions/001_init.py | 2 -- .../versions/002_drop_bm_deployments.py | 2 -- .../versions/003_add_uuid_to_bm_nodes.py | 2 -- .../004_add_instance_name_to_bm_nodes.py | 2 -- .../005_drop_unused_columns_from_nodes.py | 2 -- .../versions/006_move_prov_mac_address.py | 2 -- .../versions/007_drop_prov_mac_address.py | 2 -- .../versions/008_remove_bm_pxe_ips_table.py | 2 -- nova/virt/baremetal/db/sqlalchemy/migration.py | 2 -- nova/virt/baremetal/db/sqlalchemy/models.py | 2 -- nova/virt/baremetal/db/sqlalchemy/session.py | 2 -- nova/virt/baremetal/driver.py | 1 - nova/virt/baremetal/fake.py | 2 -- nova/virt/baremetal/iboot_pdu.py | 2 -- nova/virt/baremetal/ipmi.py | 1 - nova/virt/baremetal/pxe.py | 2 -- nova/virt/baremetal/tilera.py | 2 -- nova/virt/baremetal/tilera_pdu.py | 1 - nova/virt/baremetal/utils.py | 2 -- nova/virt/baremetal/virtual_power_driver.py | 2 -- .../baremetal/virtual_power_driver_settings.py | 2 -- nova/virt/baremetal/volume_driver.py | 1 - nova/virt/block_device.py | 2 -- nova/virt/configdrive.py | 2 -- nova/virt/cpu.py | 2 -- nova/virt/disk/__init__.py | 2 -- nova/virt/disk/api.py | 2 -- nova/virt/disk/mount/__init__.py | 2 -- nova/virt/disk/mount/api.py | 2 -- nova/virt/disk/mount/loop.py | 2 -- nova/virt/disk/mount/nbd.py | 2 -- nova/virt/disk/vfs/__init__.py | 2 -- nova/virt/disk/vfs/api.py | 2 -- nova/virt/disk/vfs/guestfs.py | 2 -- nova/virt/disk/vfs/localfs.py | 2 -- nova/virt/docker/__init__.py | 2 -- nova/virt/docker/client.py | 2 -- nova/virt/docker/driver.py | 2 -- nova/virt/docker/hostinfo.py | 2 -- nova/virt/docker/network.py | 2 -- nova/virt/driver.py | 2 -- nova/virt/event.py | 2 -- nova/virt/fake.py | 2 -- nova/virt/firewall.py | 2 -- nova/virt/hyperv/__init__.py | 2 -- nova/virt/hyperv/basevolumeutils.py | 1 - nova/virt/hyperv/constants.py | 2 -- nova/virt/hyperv/driver.py | 2 -- nova/virt/hyperv/hostops.py | 2 -- nova/virt/hyperv/hostutils.py | 2 -- nova/virt/hyperv/imagecache.py | 2 -- nova/virt/hyperv/livemigrationops.py | 2 -- nova/virt/hyperv/livemigrationutils.py | 2 -- nova/virt/hyperv/migrationops.py | 2 -- nova/virt/hyperv/networkutils.py | 2 -- nova/virt/hyperv/networkutilsv2.py | 2 -- nova/virt/hyperv/pathutils.py | 2 -- nova/virt/hyperv/snapshotops.py | 2 -- nova/virt/hyperv/utilsfactory.py | 2 -- nova/virt/hyperv/vhdutils.py | 2 -- nova/virt/hyperv/vhdutilsv2.py | 2 -- nova/virt/hyperv/vif.py | 2 -- nova/virt/hyperv/vmops.py | 2 -- nova/virt/hyperv/vmutils.py | 2 -- nova/virt/hyperv/vmutilsv2.py | 2 -- nova/virt/hyperv/volumeops.py | 2 -- nova/virt/hyperv/volumeutils.py | 2 -- nova/virt/hyperv/volumeutilsv2.py | 2 -- nova/virt/imagecache.py | 1 - nova/virt/images.py | 2 -- nova/virt/libvirt/__init__.py | 2 -- nova/virt/libvirt/blockinfo.py | 2 -- nova/virt/libvirt/config.py | 2 -- nova/virt/libvirt/designer.py | 2 -- nova/virt/libvirt/driver.py | 2 -- nova/virt/libvirt/firewall.py | 2 -- nova/virt/libvirt/imagebackend.py | 2 -- nova/virt/libvirt/imagecache.py | 2 -- nova/virt/libvirt/utils.py | 2 -- nova/virt/libvirt/vif.py | 2 -- nova/virt/libvirt/volume.py | 2 -- nova/virt/netutils.py | 2 -- nova/virt/storage_users.py | 2 -- nova/virt/virtapi.py | 2 -- nova/virt/vmwareapi/__init__.py | 2 -- nova/virt/vmwareapi/driver.py | 2 -- nova/virt/vmwareapi/error_util.py | 2 -- nova/virt/vmwareapi/fake.py | 2 -- nova/virt/vmwareapi/host.py | 1 - nova/virt/vmwareapi/io_util.py | 2 -- nova/virt/vmwareapi/network_util.py | 2 -- nova/virt/vmwareapi/read_write_util.py | 2 -- nova/virt/vmwareapi/vif.py | 2 -- nova/virt/vmwareapi/vim.py | 2 -- nova/virt/vmwareapi/vim_util.py | 2 -- nova/virt/vmwareapi/vm_util.py | 2 -- nova/virt/vmwareapi/vmops.py | 2 -- nova/virt/vmwareapi/vmware_images.py | 2 -- nova/virt/vmwareapi/volume_util.py | 2 -- nova/virt/vmwareapi/volumeops.py | 2 -- nova/virt/xenapi/__init__.py | 2 -- nova/virt/xenapi/agent.py | 2 -- nova/virt/xenapi/fake.py | 2 -- nova/virt/xenapi/firewall.py | 2 -- nova/virt/xenapi/host.py | 2 -- nova/virt/xenapi/image/utils.py | 2 -- nova/virt/xenapi/image/vdi_through_dev.py | 2 -- nova/virt/xenapi/network_utils.py | 2 -- nova/virt/xenapi/pool.py | 2 -- nova/virt/xenapi/pool_states.py | 2 -- nova/virt/xenapi/vif.py | 2 -- nova/virt/xenapi/vm_utils.py | 2 -- nova/virt/xenapi/vmops.py | 2 -- nova/virt/xenapi/volume_utils.py | 2 -- nova/virt/xenapi/volumeops.py | 2 -- nova/vnc/__init__.py | 2 -- nova/vnc/xvp_proxy.py | 2 -- nova/volume/__init__.py | 2 -- nova/volume/cinder.py | 2 -- nova/volume/encryptors/__init__.py | 2 -- nova/volume/encryptors/base.py | 2 -- nova/volume/encryptors/cryptsetup.py | 2 -- nova/volume/encryptors/luks.py | 2 -- nova/volume/encryptors/nop.py | 2 -- nova/wsgi.py | 2 -- .../networking/etc/xensource/scripts/novalib.py | 2 -- .../scripts/ovs_configure_base_flows.py | 2 -- .../xensource/scripts/ovs_configure_vif_flows.py | 2 -- .../etc/xensource/scripts/vif_rules.py | 2 -- tools/clean-vlans | 1 - tools/colorizer.py | 2 -- tools/config/analyze_opts.py | 2 -- tools/db/schema_diff.py | 3 --- tools/esx/guest_tool.py | 2 -- tools/install_venv.py | 2 -- tools/install_venv_common.py | 2 -- tools/lintstack.py | 2 -- tools/regression_tester.py | 2 -- 731 files changed, 17 insertions(+), 1380 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 9046e40b8ad0..c9f9db450071 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -13,6 +13,7 @@ Nova Specific Commandments This enforces a guideline defined in ``nova.openstack.common.db.sqlalchemy.session`` - [N310] timeutils.utcnow() wrapper must be used instead of direct calls to datetime.datetime.utcnow() to make it easy to override its return value in tests +- [N123] vim configuration should not be kept in source files. Creating Unit Tests ------------------- diff --git a/contrib/xen/vif-openstack b/contrib/xen/vif-openstack index 1df6ad6ac16b..a571c3b1aa97 100755 --- a/contrib/xen/vif-openstack +++ b/contrib/xen/vif-openstack @@ -1,6 +1,5 @@ #!/bin/bash -## vim: set syn=on ts=4 sw=4 sts=0 noet foldmethod=indent: ## copyright: B1 Systems GmbH , 2012. ## author: Christian Berendt , 2012. ## license: Apache License, Version 2.0 diff --git a/nova/__init__.py b/nova/__init__.py index e21bdd7b49e3..b8044faecee0 100644 --- a/nova/__init__.py +++ b/nova/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/auth.py b/nova/api/auth.py index b356bf9974e7..f15648a77a24 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index fcfd8bc09a66..474ba46a5221 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index 7cbc14095c44..c0f7021b5b0a 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index feb56944ada2..7e87ab908454 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 3d2b64e2e052..b86a6e3534db 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/ec2/faults.py b/nova/api/ec2/faults.py index 49874990bb62..5cac4ea7ff65 100644 --- a/nova/api/ec2/faults.py +++ b/nova/api/ec2/faults.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/api/ec2/inst_state.py b/nova/api/ec2/inst_state.py index 1451bbfba7cd..ca8282b84db0 100644 --- a/nova/api/ec2/inst_state.py +++ b/nova/api/ec2/inst_state.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Isaku Yamahata # All Rights Reserved. # diff --git a/nova/api/manager.py b/nova/api/manager.py index e2a5f8e75ab6..f254475cc2d4 100644 --- a/nova/api/manager.py +++ b/nova/api/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/metadata/__init__.py b/nova/api/metadata/__init__.py index f3d0c88ac75c..964707ba79ba 100644 --- a/nova/api/metadata/__init__.py +++ b/nova/api/metadata/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 8f8565778379..8f6bbe15242f 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index 111288e9841a..f5347a8147bc 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/metadata/vendordata_json.py b/nova/api/metadata/vendordata_json.py index 042115bbf4b7..55edd5512015 100644 --- a/nova/api/metadata/vendordata_json.py +++ b/nova/api/metadata/vendordata_json.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Canonical Ltd # All Rights Reserved. # diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 68a336e972c7..d1f26ce72404 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index fc3c5a398da7..e0aa32b400f1 100644 --- a/nova/api/openstack/auth.py +++ b/nova/api/openstack/auth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # Copyright 2010 OpenStack Foundation # All Rights Reserved. diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index 050a06a1825c..bcfe34300807 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py index e754bc011db7..6f1e5d7967bd 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/api/openstack/compute/consoles.py b/nova/api/openstack/compute/consoles.py index 73a6c02b8e3a..67e3a7ad864b 100644 --- a/nova/api/openstack/compute/consoles.py +++ b/nova/api/openstack/compute/consoles.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py index 8e1e8aa85693..e4d9dea64ccd 100644 --- a/nova/api/openstack/compute/contrib/__init__.py +++ b/nova/api/openstack/compute/contrib/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/agents.py b/nova/api/openstack/compute/contrib/agents.py index d7bea13bb72f..e667830355dd 100644 --- a/nova/api/openstack/compute/contrib/agents.py +++ b/nova/api/openstack/compute/contrib/agents.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py index c4eab045da9e..62c4a32c4a28 100644 --- a/nova/api/openstack/compute/contrib/availability_zone.py +++ b/nova/api/openstack/compute/contrib/availability_zone.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/baremetal_ext_status.py b/nova/api/openstack/compute/contrib/baremetal_ext_status.py index 3f4a6efccb74..f57b42ff98b5 100644 --- a/nova/api/openstack/compute/contrib/baremetal_ext_status.py +++ b/nova/api/openstack/compute/contrib/baremetal_ext_status.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 diff --git a/nova/api/openstack/compute/contrib/cell_capacities.py b/nova/api/openstack/compute/contrib/cell_capacities.py index ab79b4327f1e..15fb170aa6f0 100644 --- a/nova/api/openstack/compute/contrib/cell_capacities.py +++ b/nova/api/openstack/compute/contrib/cell_capacities.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Rackspace Hosting # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/cells.py b/nova/api/openstack/compute/contrib/cells.py index df725e5304a0..e20ab1ea24cf 100644 --- a/nova/api/openstack/compute/contrib/cells.py +++ b/nova/api/openstack/compute/contrib/cells.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011-2012 OpenStack Foundation # All Rights Reserved. # Copyright 2013 Red Hat, Inc. diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py index cc1afc24b0d2..b023dec5877d 100644 --- a/nova/api/openstack/compute/contrib/certificates.py +++ b/nova/api/openstack/compute/contrib/certificates.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"); you may diff --git a/nova/api/openstack/compute/contrib/cloudpipe_update.py b/nova/api/openstack/compute/contrib/cloudpipe_update.py index 20418ae54e02..b5388a246577 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe_update.py +++ b/nova/api/openstack/compute/contrib/cloudpipe_update.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/config_drive.py b/nova/api/openstack/compute/contrib/config_drive.py index f0b3de5ed3e4..29b528be2018 100644 --- a/nova/api/openstack/compute/contrib/config_drive.py +++ b/nova/api/openstack/compute/contrib/config_drive.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py index 913bcb5b134f..da1519a1df74 100644 --- a/nova/api/openstack/compute/contrib/console_output.py +++ b/nova/api/openstack/compute/contrib/console_output.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2011 Grid Dynamics # Copyright 2011 Eldar Nugaev, Kirill Shileev, Ilya Alekseyev diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py index bdbd28b88b59..07bab0be48ae 100644 --- a/nova/api/openstack/compute/contrib/consoles.py +++ b/nova/api/openstack/compute/contrib/consoles.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/createserverext.py b/nova/api/openstack/compute/contrib/createserverext.py index 9559ceef32bc..6aae15f92fc0 100644 --- a/nova/api/openstack/compute/contrib/createserverext.py +++ b/nova/api/openstack/compute/contrib/createserverext.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/disk_config.py b/nova/api/openstack/compute/contrib/disk_config.py index c3a1740b5cc2..661cd3c3dc1b 100644 --- a/nova/api/openstack/compute/contrib/disk_config.py +++ b/nova/api/openstack/compute/contrib/disk_config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/extended_availability_zone.py b/nova/api/openstack/compute/contrib/extended_availability_zone.py index 6e77cd6bdb0c..cca921104d08 100644 --- a/nova/api/openstack/compute/contrib/extended_availability_zone.py +++ b/nova/api/openstack/compute/contrib/extended_availability_zone.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Netease, LLC. # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/extended_floating_ips.py b/nova/api/openstack/compute/contrib/extended_floating_ips.py index 44b84bad94cc..eaeba0d3a8b1 100644 --- a/nova/api/openstack/compute/contrib/extended_floating_ips.py +++ b/nova/api/openstack/compute/contrib/extended_floating_ips.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/extended_ips_mac.py b/nova/api/openstack/compute/contrib/extended_ips_mac.py index a577513fd9eb..e5757326fd17 100644 --- a/nova/api/openstack/compute/contrib/extended_ips_mac.py +++ b/nova/api/openstack/compute/contrib/extended_ips_mac.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py b/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py index 8779d6879652..3c6774656bb6 100644 --- a/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py +++ b/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/extended_volumes.py b/nova/api/openstack/compute/contrib/extended_volumes.py index 22963c49e088..0996f80aa3e7 100644 --- a/nova/api/openstack/compute/contrib/extended_volumes.py +++ b/nova/api/openstack/compute/contrib/extended_volumes.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 diff --git a/nova/api/openstack/compute/contrib/fixed_ips.py b/nova/api/openstack/compute/contrib/fixed_ips.py index 306b2b729310..b667e29ac259 100644 --- a/nova/api/openstack/compute/contrib/fixed_ips.py +++ b/nova/api/openstack/compute/contrib/fixed_ips.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/flavor_access.py b/nova/api/openstack/compute/contrib/flavor_access.py index 85a90e358397..c97e7ca09fdb 100644 --- a/nova/api/openstack/compute/contrib/flavor_access.py +++ b/nova/api/openstack/compute/contrib/flavor_access.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/flavorextradata.py b/nova/api/openstack/compute/contrib/flavorextradata.py index 313b83b5dcba..70535d6e7570 100644 --- a/nova/api/openstack/compute/contrib/flavorextradata.py +++ b/nova/api/openstack/compute/contrib/flavorextradata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2011 Canonical Ltd. # All Rights Reserved. diff --git a/nova/api/openstack/compute/contrib/flavorextraspecs.py b/nova/api/openstack/compute/contrib/flavorextraspecs.py index 63de65090a47..427bb9d27d38 100644 --- a/nova/api/openstack/compute/contrib/flavorextraspecs.py +++ b/nova/api/openstack/compute/contrib/flavorextraspecs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 University of Southern California # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index 69b45f8c759b..f22003020710 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py index 1d74b3e8fff6..cc2291906e6e 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_dns.py +++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Andrew Bogott for the Wikimedia Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py index aefe65d2673c..53cce833dc60 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_pools.py +++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index 92c42a532086..b192b1c3aefc 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2011 Grid Dynamics diff --git a/nova/api/openstack/compute/contrib/floating_ips_bulk.py b/nova/api/openstack/compute/contrib/floating_ips_bulk.py index 026fcd352b6d..ff654e2f8c4b 100644 --- a/nova/api/openstack/compute/contrib/floating_ips_bulk.py +++ b/nova/api/openstack/compute/contrib/floating_ips_bulk.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py index 9d6d29778fcc..e1023a7a5a82 100644 --- a/nova/api/openstack/compute/contrib/fping.py +++ b/nova/api/openstack/compute/contrib/fping.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Grid Dynamics # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py index ce72bca41c3c..164fc578bbcf 100644 --- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/keypairs.py b/nova/api/openstack/compute/contrib/keypairs.py index 3dc7941ed0d5..3955ffeb15c8 100644 --- a/nova/api/openstack/compute/contrib/keypairs.py +++ b/nova/api/openstack/compute/contrib/keypairs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/migrations.py b/nova/api/openstack/compute/contrib/migrations.py index c1b2b344a5f7..96e295d0b801 100644 --- a/nova/api/openstack/compute/contrib/migrations.py +++ b/nova/api/openstack/compute/contrib/migrations.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/api/openstack/compute/contrib/multiple_create.py b/nova/api/openstack/compute/contrib/multiple_create.py index ee3dcf4b4dff..47085b2b1f73 100644 --- a/nova/api/openstack/compute/contrib/multiple_create.py +++ b/nova/api/openstack/compute/contrib/multiple_create.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/os_networks.py b/nova/api/openstack/compute/contrib/os_networks.py index d76ca812b32d..533a4ef910b1 100644 --- a/nova/api/openstack/compute/contrib/os_networks.py +++ b/nova/api/openstack/compute/contrib/os_networks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Grid Dynamics # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/nova/api/openstack/compute/contrib/os_tenant_networks.py b/nova/api/openstack/compute/contrib/os_tenant_networks.py index 4c4762e0418a..8d85f5c9cb53 100644 --- a/nova/api/openstack/compute/contrib/os_tenant_networks.py +++ b/nova/api/openstack/compute/contrib/os_tenant_networks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/quotas.py b/nova/api/openstack/compute/contrib/quotas.py index fa3b74a8f0bf..b3478551032c 100644 --- a/nova/api/openstack/compute/contrib/quotas.py +++ b/nova/api/openstack/compute/contrib/quotas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/scheduler_hints.py b/nova/api/openstack/compute/contrib/scheduler_hints.py index 4ad98bae88ab..746a0444453f 100644 --- a/nova/api/openstack/compute/contrib/scheduler_hints.py +++ b/nova/api/openstack/compute/contrib/scheduler_hints.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/security_group_default_rules.py b/nova/api/openstack/compute/contrib/security_group_default_rules.py index e80022058ea6..8c478de92db5 100644 --- a/nova/api/openstack/compute/contrib/security_group_default_rules.py +++ b/nova/api/openstack/compute/contrib/security_group_default_rules.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Metacloud Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/server_password.py b/nova/api/openstack/compute/contrib/server_password.py index 2884e4040ae0..b47f212b770b 100644 --- a/nova/api/openstack/compute/contrib/server_password.py +++ b/nova/api/openstack/compute/contrib/server_password.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Nebula, Inc. # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/server_start_stop.py b/nova/api/openstack/compute/contrib/server_start_stop.py index a10cc753d49f..7c2985e6d9c5 100644 --- a/nova/api/openstack/compute/contrib/server_start_stop.py +++ b/nova/api/openstack/compute/contrib/server_start_stop.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Midokura Japan K.K. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py index 0c839753f883..373582763a41 100644 --- a/nova/api/openstack/compute/contrib/services.py +++ b/nova/api/openstack/compute/contrib/services.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py index 41d7e90ce361..b2b3ee7a3d94 100644 --- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py +++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/contrib/used_limits.py b/nova/api/openstack/compute/contrib/used_limits.py index a0fab1594ed0..c28686be71cd 100644 --- a/nova/api/openstack/compute/contrib/used_limits.py +++ b/nova/api/openstack/compute/contrib/used_limits.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/contrib/used_limits_for_admin.py b/nova/api/openstack/compute/contrib/used_limits_for_admin.py index d2a8af0d7617..575a339f7f83 100644 --- a/nova/api/openstack/compute/contrib/used_limits_for_admin.py +++ b/nova/api/openstack/compute/contrib/used_limits_for_admin.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 diff --git a/nova/api/openstack/compute/contrib/user_data.py b/nova/api/openstack/compute/contrib/user_data.py index ef5aa6d5a910..246bbc845cd4 100644 --- a/nova/api/openstack/compute/contrib/user_data.py +++ b/nova/api/openstack/compute/contrib/user_data.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py index f25a6a16aac6..af3e4af7579f 100644 --- a/nova/api/openstack/compute/extensions.py +++ b/nova/api/openstack/compute/extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/flavors.py b/nova/api/openstack/compute/flavors.py index d17cb90e9662..2aa8a32d24e2 100644 --- a/nova/api/openstack/compute/flavors.py +++ b/nova/api/openstack/compute/flavors.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py index 4c24e8626bbf..4f871762d052 100644 --- a/nova/api/openstack/compute/image_metadata.py +++ b/nova/api/openstack/compute/image_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py index 5ccf7dc08c0f..3117b6b49862 100644 --- a/nova/api/openstack/compute/ips.py +++ b/nova/api/openstack/compute/ips.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/__init__.py b/nova/api/openstack/compute/plugins/__init__.py index 42c8b1280933..80445b5b47c2 100644 --- a/nova/api/openstack/compute/plugins/__init__.py +++ b/nova/api/openstack/compute/plugins/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/access_ips.py b/nova/api/openstack/compute/plugins/v3/access_ips.py index 04169c465e2f..3804c031c233 100644 --- a/nova/api/openstack/compute/plugins/v3/access_ips.py +++ b/nova/api/openstack/compute/plugins/v3/access_ips.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/admin_password.py b/nova/api/openstack/compute/plugins/v3/admin_password.py index d52a71b57b75..dedf4768e8a4 100644 --- a/nova/api/openstack/compute/plugins/v3/admin_password.py +++ b/nova/api/openstack/compute/plugins/v3/admin_password.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/agents.py b/nova/api/openstack/compute/plugins/v3/agents.py index 868b1166e4d8..2dbc1a379463 100644 --- a/nova/api/openstack/compute/plugins/v3/agents.py +++ b/nova/api/openstack/compute/plugins/v3/agents.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/availability_zone.py b/nova/api/openstack/compute/plugins/v3/availability_zone.py index f3bb1c6ba16b..35fc36918561 100644 --- a/nova/api/openstack/compute/plugins/v3/availability_zone.py +++ b/nova/api/openstack/compute/plugins/v3/availability_zone.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/block_device_mapping.py b/nova/api/openstack/compute/plugins/v3/block_device_mapping.py index 14ba43acec52..767e705afcf5 100644 --- a/nova/api/openstack/compute/plugins/v3/block_device_mapping.py +++ b/nova/api/openstack/compute/plugins/v3/block_device_mapping.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/cells.py b/nova/api/openstack/compute/plugins/v3/cells.py index 3e17ae1c800e..90f79c2a1b49 100644 --- a/nova/api/openstack/compute/plugins/v3/cells.py +++ b/nova/api/openstack/compute/plugins/v3/cells.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011-2012 OpenStack Foundation # All Rights Reserved. # Copyright 2013 Red Hat, Inc. diff --git a/nova/api/openstack/compute/plugins/v3/certificates.py b/nova/api/openstack/compute/plugins/v3/certificates.py index 519153d6fdf9..0aa252c264d3 100644 --- a/nova/api/openstack/compute/plugins/v3/certificates.py +++ b/nova/api/openstack/compute/plugins/v3/certificates.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"); you may diff --git a/nova/api/openstack/compute/plugins/v3/config_drive.py b/nova/api/openstack/compute/plugins/v3/config_drive.py index ca644b359674..b8c4986cd91d 100644 --- a/nova/api/openstack/compute/plugins/v3/config_drive.py +++ b/nova/api/openstack/compute/plugins/v3/config_drive.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/console_output.py b/nova/api/openstack/compute/plugins/v3/console_output.py index 2585ecb4f573..54489d91bfaa 100644 --- a/nova/api/openstack/compute/plugins/v3/console_output.py +++ b/nova/api/openstack/compute/plugins/v3/console_output.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2011 Grid Dynamics # Copyright 2011 Eldar Nugaev, Kirill Shileev, Ilya Alekseyev diff --git a/nova/api/openstack/compute/plugins/v3/consoles.py b/nova/api/openstack/compute/plugins/v3/consoles.py index 7258681b9947..80b2c423cbe8 100644 --- a/nova/api/openstack/compute/plugins/v3/consoles.py +++ b/nova/api/openstack/compute/plugins/v3/consoles.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py b/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py index 9e22dd2c920a..48f536b904f5 100644 --- a/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py +++ b/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Netease, LLC. # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/extended_volumes.py b/nova/api/openstack/compute/plugins/v3/extended_volumes.py index 83d69eb6b9fc..d2a56fd40671 100644 --- a/nova/api/openstack/compute/plugins/v3/extended_volumes.py +++ b/nova/api/openstack/compute/plugins/v3/extended_volumes.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 diff --git a/nova/api/openstack/compute/plugins/v3/extension_info.py b/nova/api/openstack/compute/plugins/v3/extension_info.py index a09cdf10ab97..97d1b2256261 100644 --- a/nova/api/openstack/compute/plugins/v3/extension_info.py +++ b/nova/api/openstack/compute/plugins/v3/extension_info.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/flavor_access.py b/nova/api/openstack/compute/plugins/v3/flavor_access.py index 3e138765c567..e4bd5bb0742c 100644 --- a/nova/api/openstack/compute/plugins/v3/flavor_access.py +++ b/nova/api/openstack/compute/plugins/v3/flavor_access.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/flavor_manage.py b/nova/api/openstack/compute/plugins/v3/flavor_manage.py index 5ed4f10e09f9..9dc91d815416 100644 --- a/nova/api/openstack/compute/plugins/v3/flavor_manage.py +++ b/nova/api/openstack/compute/plugins/v3/flavor_manage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/api/openstack/compute/plugins/v3/flavors.py b/nova/api/openstack/compute/plugins/v3/flavors.py index 65a16b779637..6faf86f73a31 100644 --- a/nova/api/openstack/compute/plugins/v3/flavors.py +++ b/nova/api/openstack/compute/plugins/v3/flavors.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py index 625e9962f97b..ee0e06221a90 100644 --- a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py +++ b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py b/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py index 1b0d509e4f42..28aad6e312a3 100644 --- a/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/ips.py b/nova/api/openstack/compute/plugins/v3/ips.py index 654ba1566a25..631cc75db559 100644 --- a/nova/api/openstack/compute/plugins/v3/ips.py +++ b/nova/api/openstack/compute/plugins/v3/ips.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/keypairs.py b/nova/api/openstack/compute/plugins/v3/keypairs.py index a3acf550d778..89fc5592c607 100644 --- a/nova/api/openstack/compute/plugins/v3/keypairs.py +++ b/nova/api/openstack/compute/plugins/v3/keypairs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/migrations.py b/nova/api/openstack/compute/plugins/v3/migrations.py index a0c600450ab8..9458a7c9f629 100644 --- a/nova/api/openstack/compute/plugins/v3/migrations.py +++ b/nova/api/openstack/compute/plugins/v3/migrations.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/api/openstack/compute/plugins/v3/multiple_create.py b/nova/api/openstack/compute/plugins/v3/multiple_create.py index bc0cf1dbda05..96587775a828 100644 --- a/nova/api/openstack/compute/plugins/v3/multiple_create.py +++ b/nova/api/openstack/compute/plugins/v3/multiple_create.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/pci.py b/nova/api/openstack/compute/plugins/v3/pci.py index df04361ab47f..bdf5cdfb0078 100644 --- a/nova/api/openstack/compute/plugins/v3/pci.py +++ b/nova/api/openstack/compute/plugins/v3/pci.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Intel Corporation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/quota_sets.py b/nova/api/openstack/compute/plugins/v3/quota_sets.py index 8af93a8624db..e38ae58dac9e 100644 --- a/nova/api/openstack/compute/plugins/v3/quota_sets.py +++ b/nova/api/openstack/compute/plugins/v3/quota_sets.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/remote_consoles.py b/nova/api/openstack/compute/plugins/v3/remote_consoles.py index f3c63ec810d1..d3b0a861f646 100644 --- a/nova/api/openstack/compute/plugins/v3/remote_consoles.py +++ b/nova/api/openstack/compute/plugins/v3/remote_consoles.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/scheduler_hints.py b/nova/api/openstack/compute/plugins/v3/scheduler_hints.py index 3b29c58419f5..f65df3a1b5d5 100644 --- a/nova/api/openstack/compute/plugins/v3/scheduler_hints.py +++ b/nova/api/openstack/compute/plugins/v3/scheduler_hints.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/server_metadata.py b/nova/api/openstack/compute/plugins/v3/server_metadata.py index 5009e5992c6e..d59e9e794bba 100644 --- a/nova/api/openstack/compute/plugins/v3/server_metadata.py +++ b/nova/api/openstack/compute/plugins/v3/server_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/server_password.py b/nova/api/openstack/compute/plugins/v3/server_password.py index 00d068a23473..5fed925bb200 100644 --- a/nova/api/openstack/compute/plugins/v3/server_password.py +++ b/nova/api/openstack/compute/plugins/v3/server_password.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Nebula, Inc. # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/services.py b/nova/api/openstack/compute/plugins/v3/services.py index 2a45f3001b8c..e1f940aa847a 100644 --- a/nova/api/openstack/compute/plugins/v3/services.py +++ b/nova/api/openstack/compute/plugins/v3/services.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py b/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py index 9598c2038943..3683cf3d8907 100644 --- a/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py +++ b/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/plugins/v3/user_data.py b/nova/api/openstack/compute/plugins/v3/user_data.py index 86035b31de8f..ab7874c04a67 100644 --- a/nova/api/openstack/compute/plugins/v3/user_data.py +++ b/nova/api/openstack/compute/plugins/v3/user_data.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/plugins/v3/versions.py b/nova/api/openstack/compute/plugins/v3/versions.py index 4e635227c2d2..aad3c02bd067 100644 --- a/nova/api/openstack/compute/plugins/v3/versions.py +++ b/nova/api/openstack/compute/plugins/v3/versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # All Rights Reserved. # diff --git a/nova/api/openstack/compute/schemas/v3/admin_password_schema.py b/nova/api/openstack/compute/schemas/v3/admin_password_schema.py index 273ddd0b4947..04bcad7bbf6e 100644 --- a/nova/api/openstack/compute/schemas/v3/admin_password_schema.py +++ b/nova/api/openstack/compute/schemas/v3/admin_password_schema.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 NEC Corporation. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/schemas/v3/agents_schema.py b/nova/api/openstack/compute/schemas/v3/agents_schema.py index 09724365a6e8..f54392f22f1b 100644 --- a/nova/api/openstack/compute/schemas/v3/agents_schema.py +++ b/nova/api/openstack/compute/schemas/v3/agents_schema.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 NEC Corporation. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/schemas/v3/extended_volumes_schema.py b/nova/api/openstack/compute/schemas/v3/extended_volumes_schema.py index 63773760a51c..8ee88797dd89 100644 --- a/nova/api/openstack/compute/schemas/v3/extended_volumes_schema.py +++ b/nova/api/openstack/compute/schemas/v3/extended_volumes_schema.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 NEC Corporation. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/schemas/v3/flavor_access_schema.py b/nova/api/openstack/compute/schemas/v3/flavor_access_schema.py index 6f9f7e075b7a..571b639ccecf 100644 --- a/nova/api/openstack/compute/schemas/v3/flavor_access_schema.py +++ b/nova/api/openstack/compute/schemas/v3/flavor_access_schema.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 NEC Corporation. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/schemas/v3/keypairs_schema.py b/nova/api/openstack/compute/schemas/v3/keypairs_schema.py index d01b3a26a2e8..e32d4a448be4 100644 --- a/nova/api/openstack/compute/schemas/v3/keypairs_schema.py +++ b/nova/api/openstack/compute/schemas/v3/keypairs_schema.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 NEC Corporation. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/openstack/compute/server_metadata.py b/nova/api/openstack/compute/server_metadata.py index 972526af0ce9..baf4b40feb5f 100644 --- a/nova/api/openstack/compute/server_metadata.py +++ b/nova/api/openstack/compute/server_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/versions.py b/nova/api/openstack/compute/versions.py index b93287bb6878..0ee2060df6a6 100644 --- a/nova/api/openstack/compute/versions.py +++ b/nova/api/openstack/compute/versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py index 121d19e0577d..78640d486833 100644 --- a/nova/api/openstack/compute/views/addresses.py +++ b/nova/api/openstack/compute/views/addresses.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/views/flavors.py b/nova/api/openstack/compute/views/flavors.py index 5a82f32113d3..1e4ce0bc9d8a 100644 --- a/nova/api/openstack/compute/views/flavors.py +++ b/nova/api/openstack/compute/views/flavors.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py index 306b99692758..228feb9449c5 100644 --- a/nova/api/openstack/compute/views/images.py +++ b/nova/api/openstack/compute/views/images.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2013 IBM Corp. # All Rights Reserved. diff --git a/nova/api/openstack/compute/views/limits.py b/nova/api/openstack/compute/views/limits.py index 8ceec3c29217..ba686f87a5fc 100644 --- a/nova/api/openstack/compute/views/limits.py +++ b/nova/api/openstack/compute/views/limits.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py index 1b16036c7e2c..186e50a89fd7 100644 --- a/nova/api/openstack/compute/views/servers.py +++ b/nova/api/openstack/compute/views/servers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2011 Piston Cloud Computing, Inc. # All Rights Reserved. diff --git a/nova/api/openstack/compute/views/versions.py b/nova/api/openstack/compute/views/versions.py index 336008c7ac56..315acb6f7f5f 100644 --- a/nova/api/openstack/compute/views/versions.py +++ b/nova/api/openstack/compute/views/versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index f477ba675069..3b929a3af280 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2011 Justin Santa Barbara # All Rights Reserved. diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py index 1fe1b4e2c20d..b8404c6eb8d7 100644 --- a/nova/api/openstack/urlmap.py +++ b/nova/api/openstack/urlmap.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py index 5cf51e575c7c..13d72c252b2c 100644 --- a/nova/api/openstack/wsgi.py +++ b/nova/api/openstack/wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/nova/api/openstack/xmlutil.py b/nova/api/openstack/xmlutil.py index 4cfaae748bbb..7bc5714a3b2c 100644 --- a/nova/api/openstack/xmlutil.py +++ b/nova/api/openstack/xmlutil.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py index 03326cc87992..627d5cb63314 100644 --- a/nova/api/sizelimit.py +++ b/nova/api/sizelimit.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"); you may diff --git a/nova/api/validation/__init__.py b/nova/api/validation/__init__.py index 89c2a6541bed..2e8f8777a624 100644 --- a/nova/api/validation/__init__.py +++ b/nova/api/validation/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 NEC Corporation. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/validation/validators.py b/nova/api/validation/validators.py index 23a68683b190..3e5e82accba2 100644 --- a/nova/api/validation/validators.py +++ b/nova/api/validation/validators.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 NEC Corporation. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/api/validator.py b/nova/api/validator.py index 9d0cb9248e3b..7fec60d2e55e 100644 --- a/nova/api/validator.py +++ b/nova/api/validator.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Cloudscaling, Inc. # Author: Matthew Hooker # All Rights Reserved. diff --git a/nova/block_device.py b/nova/block_device.py index 55f188b15375..cfec3f30f8d6 100644 --- a/nova/block_device.py +++ b/nova/block_device.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Isaku Yamahata # All Rights Reserved. # diff --git a/nova/cells/__init__.py b/nova/cells/__init__.py index 47d21a14b3bd..ea277b7f9c8a 100644 --- a/nova/cells/__init__.py +++ b/nova/cells/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Rackspace Hosting # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/cells/opts.py b/nova/cells/opts.py index 118aef6e3cc5..cb1dfe52da3d 100644 --- a/nova/cells/opts.py +++ b/nova/cells/opts.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Rackspace Hosting # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/cert/__init__.py b/nova/cert/__init__.py index 74704e5e697b..39f9ab69b39c 100644 --- a/nova/cert/__init__.py +++ b/nova/cert/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/cert/manager.py b/nova/cert/manager.py index ae58aad067ac..795488f52931 100644 --- a/nova/cert/manager.py +++ b/nova/cert/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py index 9dc6c4a036d7..ff0647b126db 100644 --- a/nova/cert/rpcapi.py +++ b/nova/cert/rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013, Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/cloudpipe/__init__.py b/nova/cloudpipe/__init__.py index ee569500b4a8..aa6c77a5aa8c 100644 --- a/nova/cloudpipe/__init__.py +++ b/nova/cloudpipe/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cloudpipe/bootscript.template b/nova/cloudpipe/bootscript.template index 0fe38b79b827..c6fbc08621e5 100755 --- a/nova/cloudpipe/bootscript.template +++ b/nova/cloudpipe/bootscript.template @@ -1,6 +1,4 @@ #!/bin/bash -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cloudpipe/client.ovpn.template b/nova/cloudpipe/client.ovpn.template index 07bb605f4a89..dd48b556f145 100644 --- a/nova/cloudpipe/client.ovpn.template +++ b/nova/cloudpipe/client.ovpn.template @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 6f3f3d0d9b49..cb0ecc3f9633 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/all.py b/nova/cmd/all.py index ebbfaddfe388..0c44de6e21bd 100644 --- a/nova/cmd/all.py +++ b/nova/cmd/all.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/cmd/api.py b/nova/cmd/api.py index f838d988fd8b..acd0f00fb4ae 100644 --- a/nova/cmd/api.py +++ b/nova/cmd/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/api_ec2.py b/nova/cmd/api_ec2.py index 754d65d1a063..6e83ee069747 100644 --- a/nova/cmd/api_ec2.py +++ b/nova/cmd/api_ec2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/api_metadata.py b/nova/cmd/api_metadata.py index b4e73b04e3ca..f1042d0cefce 100644 --- a/nova/cmd/api_metadata.py +++ b/nova/cmd/api_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/api_os_compute.py b/nova/cmd/api_os_compute.py index 956ce6106281..659c433e63eb 100644 --- a/nova/cmd/api_os_compute.py +++ b/nova/cmd/api_os_compute.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/baremetal_deploy_helper.py b/nova/cmd/baremetal_deploy_helper.py index 72200cd5db23..8547e2cad5dd 100644 --- a/nova/cmd/baremetal_deploy_helper.py +++ b/nova/cmd/baremetal_deploy_helper.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # All Rights Reserved. # diff --git a/nova/cmd/baremetal_manage.py b/nova/cmd/baremetal_manage.py index 40efe3fa3154..29f9408ce459 100644 --- a/nova/cmd/baremetal_manage.py +++ b/nova/cmd/baremetal_manage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/cmd/cells.py b/nova/cmd/cells.py index 35fa9b64f35e..7db4b402d5da 100644 --- a/nova/cmd/cells.py +++ b/nova/cmd/cells.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2012 Rackspace Hosting # All Rights Reserved. # diff --git a/nova/cmd/cert.py b/nova/cmd/cert.py index 1338b8dc8ac0..08d66e287ae6 100644 --- a/nova/cmd/cert.py +++ b/nova/cmd/cert.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/cmd/compute.py b/nova/cmd/compute.py index 6f98e9680093..e7ed654ba509 100644 --- a/nova/cmd/compute.py +++ b/nova/cmd/compute.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/conductor.py b/nova/cmd/conductor.py index 94377f7045a3..9de95ba21ff8 100644 --- a/nova/cmd/conductor.py +++ b/nova/cmd/conductor.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/cmd/console.py b/nova/cmd/console.py index 4fdc090f6e80..b157d99b2154 100644 --- a/nova/cmd/console.py +++ b/nova/cmd/console.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/cmd/consoleauth.py b/nova/cmd/consoleauth.py index 130f7ad65703..3df171e0e35b 100644 --- a/nova/cmd/consoleauth.py +++ b/nova/cmd/consoleauth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/cmd/dhcpbridge.py b/nova/cmd/dhcpbridge.py index 82c848398815..b93238aad5f3 100644 --- a/nova/cmd/dhcpbridge.py +++ b/nova/cmd/dhcpbridge.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 26d00384a29f..f31b02d94c1f 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/cmd/network.py b/nova/cmd/network.py index bf7073f3f07d..9f57b2f2e263 100644 --- a/nova/cmd/network.py +++ b/nova/cmd/network.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/novnc.py b/nova/cmd/novnc.py index 3397bb81636c..ea143746bc57 100644 --- a/nova/cmd/novnc.py +++ b/nova/cmd/novnc.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/cmd/novncproxy.py b/nova/cmd/novncproxy.py index cb818c387c9f..6d3082247991 100644 --- a/nova/cmd/novncproxy.py +++ b/nova/cmd/novncproxy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/cmd/objectstore.py b/nova/cmd/objectstore.py index 12e08beb814a..35790adc78cc 100644 --- a/nova/cmd/objectstore.py +++ b/nova/cmd/objectstore.py @@ -1,6 +1,4 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/scheduler.py b/nova/cmd/scheduler.py index b8e6b99aa2a1..1e87e16f3c7e 100644 --- a/nova/cmd/scheduler.py +++ b/nova/cmd/scheduler.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/cmd/spicehtml5proxy.py b/nova/cmd/spicehtml5proxy.py index 76cca61c98d2..a9ad98cd1cf9 100644 --- a/nova/cmd/spicehtml5proxy.py +++ b/nova/cmd/spicehtml5proxy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/cmd/xvpvncproxy.py b/nova/cmd/xvpvncproxy.py index 7d0c87627814..6a1e69568279 100644 --- a/nova/cmd/xvpvncproxy.py +++ b/nova/cmd/xvpvncproxy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/compute/__init__.py b/nova/compute/__init__.py index 414084c700c1..0da62ccbabbc 100644 --- a/nova/compute/__init__.py +++ b/nova/compute/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/compute/api.py b/nova/compute/api.py index f53d1a379e55..01692bdc0986 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Piston Cloud Computing, Inc. diff --git a/nova/compute/flavors.py b/nova/compute/flavors.py index 10cd3673b652..2a0ecaf7640d 100644 --- a/nova/compute/flavors.py +++ b/nova/compute/flavors.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/compute/instance_actions.py b/nova/compute/instance_actions.py index 24f556fcd616..92e4b369df6d 100644 --- a/nova/compute/instance_actions.py +++ b/nova/compute/instance_actions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 30e769332992..d0c196ea82a4 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/nova/compute/power_state.py b/nova/compute/power_state.py index 6d1c00b984d7..d315c0c61167 100644 --- a/nova/compute/power_state.py +++ b/nova/compute/power_state.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index 4cc21821389a..077ff632d12c 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/compute/task_states.py b/nova/compute/task_states.py index ee74f1d22ff7..53cf0f52417e 100644 --- a/nova/compute/task_states.py +++ b/nova/compute/task_states.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/compute/utils.py b/nova/compute/utils.py index 3af9e3ca2093..48d7079833ef 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/compute/vm_mode.py b/nova/compute/vm_mode.py index 71da62b4559c..1511ec47b12b 100644 --- a/nova/compute/vm_mode.py +++ b/nova/compute/vm_mode.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # All Rights Reserved. # diff --git a/nova/compute/vm_states.py b/nova/compute/vm_states.py index c3604ffe70fa..5fe639773a6a 100644 --- a/nova/compute/vm_states.py +++ b/nova/compute/vm_states.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/conductor/tasks/live_migrate.py b/nova/conductor/tasks/live_migrate.py index 8dcdd2c34e85..1cc2bb1bac1c 100644 --- a/nova/conductor/tasks/live_migrate.py +++ b/nova/conductor/tasks/live_migrate.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/config.py b/nova/config.py index 4e010e1f5d2f..faa35911ef16 100644 --- a/nova/config.py +++ b/nova/config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/console/__init__.py b/nova/console/__init__.py index 4ee17c821666..f7fabcd5feda 100644 --- a/nova/console/__init__.py +++ b/nova/console/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/console/api.py b/nova/console/api.py index d472a9e08da9..f3cb9d3b424b 100644 --- a/nova/console/api.py +++ b/nova/console/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/console/fake.py b/nova/console/fake.py index 7e96f43f3b89..3c9e998a3aad 100644 --- a/nova/console/fake.py +++ b/nova/console/fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/console/manager.py b/nova/console/manager.py index 99af0f5ef64d..303cc1d0f36c 100644 --- a/nova/console/manager.py +++ b/nova/console/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py index 7f5c7e6bf556..4fcc2d450e4f 100644 --- a/nova/console/rpcapi.py +++ b/nova/console/rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/console/vmrc.py b/nova/console/vmrc.py index f23b745ef639..790093fca60b 100644 --- a/nova/console/vmrc.py +++ b/nova/console/vmrc.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/console/vmrc_manager.py b/nova/console/vmrc_manager.py index bb4691e599c5..5eab5c349c92 100644 --- a/nova/console/vmrc_manager.py +++ b/nova/console/vmrc_manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/console/websocketproxy.py b/nova/console/websocketproxy.py index acf714495042..d2bb555bec00 100644 --- a/nova/console/websocketproxy.py +++ b/nova/console/websocketproxy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/console/xvp.py b/nova/console/xvp.py index 9f379f79dc58..81418e494ab4 100644 --- a/nova/console/xvp.py +++ b/nova/console/xvp.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/consoleauth/__init__.py b/nova/consoleauth/__init__.py index 35f174ad63c7..55367758625e 100644 --- a/nova/consoleauth/__init__.py +++ b/nova/consoleauth/__init__.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index 230e0347f63b..f51efeac2948 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py index 051e6435524f..6a48e9089b98 100644 --- a/nova/consoleauth/rpcapi.py +++ b/nova/consoleauth/rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/context.py b/nova/context.py index 9f2f8bceba98..4ace6d974c2b 100644 --- a/nova/context.py +++ b/nova/context.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/crypto.py b/nova/crypto.py index 5f3a24e307bc..83425e7037a9 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/db/__init__.py b/nova/db/__init__.py index 8ae248cf9911..63b3b6fb08f5 100644 --- a/nova/db/__init__.py +++ b/nova/db/__init__.py @@ -1,6 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/db/api.py b/nova/db/api.py index 5d910920bd43..08e3d4a7585b 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/db/base.py b/nova/db/base.py index 2fb5c6b9e25b..303f0ba76971 100644 --- a/nova/db/base.py +++ b/nova/db/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/db/migration.py b/nova/db/migration.py index b25adbe1f328..49ab83536422 100644 --- a/nova/db/migration.py +++ b/nova/db/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/db/sqlalchemy/__init__.py b/nova/db/sqlalchemy/__init__.py index 800f11071193..03fec6f2c5d9 100644 --- a/nova/db/sqlalchemy/__init__.py +++ b/nova/db/sqlalchemy/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 41ab1b7631fc..ef47998f0a99 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/db/sqlalchemy/migrate_repo/__init__.py b/nova/db/sqlalchemy/migrate_repo/__init__.py index 74704e5e697b..39f9ab69b39c 100644 --- a/nova/db/sqlalchemy/migrate_repo/__init__.py +++ b/nova/db/sqlalchemy/migrate_repo/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/db/sqlalchemy/migrate_repo/manage.py b/nova/db/sqlalchemy/migrate_repo/manage.py index 3ff394182d9c..6c2b3842ba22 100644 --- a/nova/db/sqlalchemy/migrate_repo/manage.py +++ b/nova/db/sqlalchemy/migrate_repo/manage.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py b/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py index 26e1276d4895..8db11e692b21 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/db/sqlalchemy/migrate_repo/versions/228_add_metrics_in_compute_nodes.py b/nova/db/sqlalchemy/migrate_repo/versions/228_add_metrics_in_compute_nodes.py index 680a1b1e92ae..7a9a98a38f1f 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/228_add_metrics_in_compute_nodes.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/228_add_metrics_in_compute_nodes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/db/sqlalchemy/migrate_repo/versions/__init__.py b/nova/db/sqlalchemy/migrate_repo/versions/__init__.py index 74704e5e697b..39f9ab69b39c 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/__init__.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index 12756e2e8069..8e4d7aac21dc 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 18fa826b9bdf..8bbecab3ed97 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/db/sqlalchemy/types.py b/nova/db/sqlalchemy/types.py index f4ab0ee588fa..4b771e2ea8fd 100644 --- a/nova/db/sqlalchemy/types.py +++ b/nova/db/sqlalchemy/types.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/db/sqlalchemy/utils.py b/nova/db/sqlalchemy/utils.py index b07058c13a75..092b2f6ff670 100644 --- a/nova/db/sqlalchemy/utils.py +++ b/nova/db/sqlalchemy/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Boris Pavlovic (boris@pavlovic.me). # All Rights Reserved. # diff --git a/nova/exception.py b/nova/exception.py index 2549fc9a20ee..d6431bc1a48f 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/hacking/checks.py b/nova/hacking/checks.py index eda824fb715f..c7230e1b5706 100644 --- a/nova/hacking/checks.py +++ b/nova/hacking/checks.py @@ -17,6 +17,7 @@ import re session_check = re.compile("\w*def [a-zA-Z0-9].*[(].*session.*[)]") cfg_re = re.compile(".*\scfg\.") +vi_header_re = re.compile("^#\s+vim?:.+") def import_no_db_in_virt(logical_line, filename): @@ -59,8 +60,23 @@ def capital_cfg_help(logical_line, tokens): yield(0, msg) +def no_vi_headers(physical_line, line_number, lines): + """Check for vi editor configuration in source files. + + By default vi modelines can only appear in the first or + last 5 lines of a source file. + + N123 + """ + # NOTE(gilliard): line_number is 1-indexed + if line_number <= 5 or line_number > len(lines) - 5: + if vi_header_re.match(physical_line): + return 0, "N123: Don't put vi configuration in source files" + + def factory(register): register(import_no_db_in_virt) register(no_db_session_in_public_api) register(use_timeutils_utcnow) register(capital_cfg_help) + register(no_vi_headers) diff --git a/nova/hooks.py b/nova/hooks.py index bf1af550177e..2247457c8012 100644 --- a/nova/hooks.py +++ b/nova/hooks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/image/download/__init__.py b/nova/image/download/__init__.py index c05688387660..ad0affb213ae 100644 --- a/nova/image/download/__init__.py +++ b/nova/image/download/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/nova/image/download/base.py b/nova/image/download/base.py index 0ee3404c0697..e2b3ede9e940 100644 --- a/nova/image/download/base.py +++ b/nova/image/download/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/nova/image/download/file.py b/nova/image/download/file.py index 8724fd5519bc..57b5c516d187 100644 --- a/nova/image/download/file.py +++ b/nova/image/download/file.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/nova/image/glance.py b/nova/image/glance.py index 03643edace33..b5c894405c98 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/image/s3.py b/nova/image/s3.py index c1027ede6b89..db54630bef57 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/ipv6/__init__.py b/nova/ipv6/__init__.py index 711c7ad136ad..05bd0358a75f 100644 --- a/nova/ipv6/__init__.py +++ b/nova/ipv6/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/ipv6/account_identifier.py b/nova/ipv6/account_identifier.py index 4cc618b6a192..db9c65896844 100644 --- a/nova/ipv6/account_identifier.py +++ b/nova/ipv6/account_identifier.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/nova/ipv6/api.py b/nova/ipv6/api.py index 06a0891d9c95..da8102e0c811 100644 --- a/nova/ipv6/api.py +++ b/nova/ipv6/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/ipv6/rfc2462.py b/nova/ipv6/rfc2462.py index ba3bbcd76e04..cda35b0a45a2 100644 --- a/nova/ipv6/rfc2462.py +++ b/nova/ipv6/rfc2462.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/nova/keymgr/__init__.py b/nova/keymgr/__init__.py index 5370326e3abb..5adb22e42d0e 100644 --- a/nova/keymgr/__init__.py +++ b/nova/keymgr/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/keymgr/conf_key_mgr.py b/nova/keymgr/conf_key_mgr.py index f0b87465d4ef..fa7680876870 100644 --- a/nova/keymgr/conf_key_mgr.py +++ b/nova/keymgr/conf_key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/keymgr/key.py b/nova/keymgr/key.py index 8f9903e23e82..2f12332ef77c 100644 --- a/nova/keymgr/key.py +++ b/nova/keymgr/key.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/keymgr/key_mgr.py b/nova/keymgr/key_mgr.py index b47c79e9055b..4fb4f07bc057 100644 --- a/nova/keymgr/key_mgr.py +++ b/nova/keymgr/key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/keymgr/mock_key_mgr.py b/nova/keymgr/mock_key_mgr.py index ff65341a4ad6..06dc9739b32d 100644 --- a/nova/keymgr/mock_key_mgr.py +++ b/nova/keymgr/mock_key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/keymgr/not_implemented_key_mgr.py b/nova/keymgr/not_implemented_key_mgr.py index 827a3ca9807d..a98e657df37e 100644 --- a/nova/keymgr/not_implemented_key_mgr.py +++ b/nova/keymgr/not_implemented_key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/keymgr/single_key_mgr.py b/nova/keymgr/single_key_mgr.py index d41e84381453..5bf95166d655 100644 --- a/nova/keymgr/single_key_mgr.py +++ b/nova/keymgr/single_key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/manager.py b/nova/manager.py index a7b67cfa7cc0..ed51613c468b 100644 --- a/nova/manager.py +++ b/nova/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/netconf.py b/nova/netconf.py index 9a1a261fde61..712d797d6b66 100644 --- a/nova/netconf.py +++ b/nova/netconf.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/network/__init__.py b/nova/network/__init__.py index 1704035a3edf..1a28ce15c735 100644 --- a/nova/network/__init__.py +++ b/nova/network/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/network/api.py b/nova/network/api.py index c530d70c6b98..5870217fb48c 100644 --- a/nova/network/api.py +++ b/nova/network/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/network/driver.py b/nova/network/driver.py index aca906bb1f63..973ec30f8e7a 100644 --- a/nova/network/driver.py +++ b/nova/network/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/network/floating_ips.py b/nova/network/floating_ips.py index bf97209c032d..03deb6c5612c 100644 --- a/nova/network/floating_ips.py +++ b/nova/network/floating_ips.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/network/l3.py b/nova/network/l3.py index 4fac2f135b25..c3d53fb00e92 100644 --- a/nova/network/l3.py +++ b/nova/network/l3.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Nicira Networks, Inc # All Rights Reserved. # diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 6f499195c4c8..53aff3a031fb 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/network/manager.py b/nova/network/manager.py index 0125c450ac58..ddad8c9c842e 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/network/model.py b/nova/network/model.py index 9a543a31e8e3..3a5a929ac5ee 100644 --- a/nova/network/model.py +++ b/nova/network/model.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/network/neutronv2/__init__.py b/nova/network/neutronv2/__init__.py index 7169890e19bb..c9f6a69ff787 100644 --- a/nova/network/neutronv2/__init__.py +++ b/nova/network/neutronv2/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012 OpenStack Foundation # All Rights Reserved # diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index 37904cdb88de..30118dff8513 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 import time diff --git a/nova/network/neutronv2/constants.py b/nova/network/neutronv2/constants.py index a9be8730fd2c..fe6ee3b6ddbf 100644 --- a/nova/network/neutronv2/constants.py +++ b/nova/network/neutronv2/constants.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 UnitedStack Inc. # All Rights Reserved. # diff --git a/nova/network/noop_dns_driver.py b/nova/network/noop_dns_driver.py index 68a1862e6983..d6f2783eab9c 100644 --- a/nova/network/noop_dns_driver.py +++ b/nova/network/noop_dns_driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/network/nova_ipam_lib.py b/nova/network/nova_ipam_lib.py index 76734457879f..58af85b68e52 100644 --- a/nova/network/nova_ipam_lib.py +++ b/nova/network/nova_ipam_lib.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Nicira Networks, Inc # All Rights Reserved. # diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index a517c4153c03..8417e67d4bb2 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013, Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/network/security_group/__init__.py b/nova/network/security_group/__init__.py index 5f67d78818dd..4ed40b67a47f 100644 --- a/nova/network/security_group/__init__.py +++ b/nova/network/security_group/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Nicira, Inc. # All Rights Reserved # diff --git a/nova/network/security_group/neutron_driver.py b/nova/network/security_group/neutron_driver.py index 5f0fa6fc065f..14fafbe19b58 100644 --- a/nova/network/security_group/neutron_driver.py +++ b/nova/network/security_group/neutron_driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Nicira, Inc. # All Rights Reserved # diff --git a/nova/network/security_group/openstack_driver.py b/nova/network/security_group/openstack_driver.py index 18cb40b6bef4..44c5a75c90f3 100644 --- a/nova/network/security_group/openstack_driver.py +++ b/nova/network/security_group/openstack_driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Nicira, Inc. # All Rights Reserved # diff --git a/nova/network/security_group/security_group_base.py b/nova/network/security_group/security_group_base.py index fe6b75290421..8c0d80189f4a 100644 --- a/nova/network/security_group/security_group_base.py +++ b/nova/network/security_group/security_group_base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Piston Cloud Computing, Inc. diff --git a/nova/notifications.py b/nova/notifications.py index f3b004ff3489..a18a2419ce26 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # Copyright 2013 Red Hat, Inc. diff --git a/nova/objects/instance_group.py b/nova/objects/instance_group.py index 13ea6d83a39e..cc2d8d371c15 100644 --- a/nova/objects/instance_group.py +++ b/nova/objects/instance_group.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"); you may diff --git a/nova/objects/pci_device.py b/nova/objects/pci_device.py index 1cfc14927650..9c4419e9554a 100644 --- a/nova/objects/pci_device.py +++ b/nova/objects/pci_device.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Intel Corporation # All Rights Reserved. # diff --git a/nova/objectstore/__init__.py b/nova/objectstore/__init__.py index 9fe102ba9dde..e771027ef55c 100644 --- a/nova/objectstore/__init__.py +++ b/nova/objectstore/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/objectstore/s3server.py b/nova/objectstore/s3server.py index c3c7057de555..a74d76392985 100644 --- a/nova/objectstore/s3server.py +++ b/nova/objectstore/s3server.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2010 OpenStack Foundation diff --git a/nova/openstack/common/log_handler.py b/nova/openstack/common/log_handler.py index 266f35707882..e2bed4f0e597 100644 --- a/nova/openstack/common/log_handler.py +++ b/nova/openstack/common/log_handler.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/openstack/common/uuidutils.py b/nova/openstack/common/uuidutils.py index 7608acb9421f..234b880c9996 100644 --- a/nova/openstack/common/uuidutils.py +++ b/nova/openstack/common/uuidutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Intel Corporation. # All Rights Reserved. # diff --git a/nova/paths.py b/nova/paths.py index 8d8a632c07cf..5fc556057a13 100644 --- a/nova/paths.py +++ b/nova/paths.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/pci/pci_manager.py b/nova/pci/pci_manager.py index 31f277f32410..9ab7c2767ebf 100644 --- a/nova/pci/pci_manager.py +++ b/nova/pci/pci_manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Intel, Inc. # Copyright (c) 2013 OpenStack Foundation # All Rights Reserved. diff --git a/nova/pci/pci_request.py b/nova/pci/pci_request.py index e25a7c2e6a2c..1a785452b51a 100644 --- a/nova/pci/pci_request.py +++ b/nova/pci/pci_request.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Intel Corporation # All Rights Reserved. # diff --git a/nova/pci/pci_stats.py b/nova/pci/pci_stats.py index 8bc5e42925ab..ae9454253f14 100644 --- a/nova/pci/pci_stats.py +++ b/nova/pci/pci_stats.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Intel, Inc. # Copyright (c) 2013 OpenStack Foundation # All Rights Reserved. diff --git a/nova/pci/pci_utils.py b/nova/pci/pci_utils.py index bdf1e72fe43a..4490a488df4b 100644 --- a/nova/pci/pci_utils.py +++ b/nova/pci/pci_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Intel, Inc. # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. diff --git a/nova/pci/pci_whitelist.py b/nova/pci/pci_whitelist.py index b11c816b151f..239473065728 100644 --- a/nova/pci/pci_whitelist.py +++ b/nova/pci/pci_whitelist.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Intel, Inc. # Copyright (c) 2013 OpenStack Foundation # All Rights Reserved. diff --git a/nova/policy.py b/nova/policy.py index 12cf3648abc1..8a522fcaef7c 100644 --- a/nova/policy.py +++ b/nova/policy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/quota.py b/nova/quota.py index 19647433babe..f452923dd745 100644 --- a/nova/quota.py +++ b/nova/quota.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/rpc.py b/nova/rpc.py index 609a2769aeaf..a54610f9db9c 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/safe_utils.py b/nova/safe_utils.py index 9c8fc281067d..a6d273473385 100644 --- a/nova/safe_utils.py +++ b/nova/safe_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/nova/scheduler/__init__.py b/nova/scheduler/__init__.py index 7dc4ffc35ebb..ff2609381f9e 100644 --- a/nova/scheduler/__init__.py +++ b/nova/scheduler/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/scheduler/chance.py b/nova/scheduler/chance.py index b3d96677107a..8efd0fa87dd7 100644 --- a/nova/scheduler/chance.py +++ b/nova/scheduler/chance.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 43b20e8bbbbb..fb39638f1c43 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/scheduler/filters/pci_passthrough_filter.py b/nova/scheduler/filters/pci_passthrough_filter.py index f66795ead16d..dc71e18baaa5 100644 --- a/nova/scheduler/filters/pci_passthrough_filter.py +++ b/nova/scheduler/filters/pci_passthrough_filter.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 ISP RAS. # All Rights Reserved. # diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py index add7eb4f9e3f..2eac14174d62 100644 --- a/nova/scheduler/filters/trusted_filter.py +++ b/nova/scheduler/filters/trusted_filter.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Intel, Inc. # Copyright (c) 2011-2012 OpenStack Foundation # All Rights Reserved. diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index 529ce7fdacd6..889e13c493d9 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 3a2e85e6303e..004ddcd0fd68 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013, Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/scheduler/scheduler_options.py b/nova/scheduler/scheduler_options.py index d88c2174fe88..435f911b2ece 100644 --- a/nova/scheduler/scheduler_options.py +++ b/nova/scheduler/scheduler_options.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/service.py b/nova/service.py index b50b92dcc526..f835c7ed90e7 100644 --- a/nova/service.py +++ b/nova/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/nova/spice/__init__.py b/nova/spice/__init__.py index b7c5e517ca96..5db3bbb8875b 100644 --- a/nova/spice/__init__.py +++ b/nova/spice/__init__.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/nova/storage/__init__.py b/nova/storage/__init__.py index 931ad9875bd6..dc7b6bf696ac 100644 --- a/nova/storage/__init__.py +++ b/nova/storage/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/storage/linuxscsi.py b/nova/storage/linuxscsi.py index 8bda99adaf6d..371656ad3235 100644 --- a/nova/storage/linuxscsi.py +++ b/nova/storage/linuxscsi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # (c) Copyright 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/test.py b/nova/test.py index eaf01f7427de..6b470ae5f5d5 100644 --- a/nova/test.py +++ b/nova/test.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index 6cbd763ddddc..566fabba1d0a 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/api/__init__.py b/nova/tests/api/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/api/__init__.py +++ b/nova/tests/api/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/ec2/__init__.py b/nova/tests/api/ec2/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/api/ec2/__init__.py +++ b/nova/tests/api/ec2/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/ec2/test_api.py b/nova/tests/api/ec2/test_api.py index cc7fd32023ff..04f5dd854080 100644 --- a/nova/tests/api/ec2/test_api.py +++ b/nova/tests/api/ec2/test_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index c464ca4e09ba..8c1ed8fe5d87 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index c7cda3ef4f57..9ce34c80f637 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py index 8ff4270fdf21..187cc692b46a 100644 --- a/nova/tests/api/ec2/test_ec2_validate.py +++ b/nova/tests/api/ec2/test_ec2_validate.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudscaling, Inc. # Author: Joe Gordon # All Rights Reserved. diff --git a/nova/tests/api/ec2/test_faults.py b/nova/tests/api/ec2/test_faults.py index 60c560845cad..ae71be9bbf68 100644 --- a/nova/tests/api/ec2/test_faults.py +++ b/nova/tests/api/ec2/test_faults.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # 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 diff --git a/nova/tests/api/ec2/test_middleware.py b/nova/tests/api/ec2/test_middleware.py index 4ff203238a73..816512333d26 100644 --- a/nova/tests/api/ec2/test_middleware.py +++ b/nova/tests/api/ec2/test_middleware.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/api/openstack/__init__.py b/nova/tests/api/openstack/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/api/openstack/__init__.py +++ b/nova/tests/api/openstack/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/common.py b/nova/tests/api/openstack/common.py index 468bc5626fb0..a50a65688e73 100644 --- a/nova/tests/api/openstack/common.py +++ b/nova/tests/api/openstack/common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/__init__.py b/nova/tests/api/openstack/compute/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/api/openstack/compute/__init__.py +++ b/nova/tests/api/openstack/compute/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/__init__.py b/nova/tests/api/openstack/compute/contrib/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/api/openstack/compute/contrib/__init__.py +++ b/nova/tests/api/openstack/compute/contrib/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/api/openstack/compute/contrib/test_createserverext.py index 09d836a326dc..6519bded3822 100644 --- a/nova/tests/api/openstack/compute/contrib/test_createserverext.py +++ b/nova/tests/api/openstack/compute/contrib/test_createserverext.py @@ -1,5 +1,3 @@ -# vim: tabstop=5 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py b/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py index 191a8b469108..d2ac6d1cbeae 100644 --- a/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py +++ b/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/api/openstack/compute/contrib/test_disk_config.py index 4cd83c63d17a..9f60a0303229 100644 --- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py +++ b/nova/tests/api/openstack/compute/contrib/test_disk_config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py b/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py index 59b1480f7cfd..269afcd807d7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py b/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py index a458dbb1a015..b873dd51ed2c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py b/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py index 8e38c4cb7f92..d6f594fe8ebd 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 University of Southern California # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_migrations.py b/nova/tests/api/openstack/compute/contrib/test_migrations.py index f6f9d8e9a5a4..1e57b4828182 100644 --- a/nova/tests/api/openstack/compute/contrib/test_migrations.py +++ b/nova/tests/api/openstack/compute/contrib/test_migrations.py @@ -1,5 +1,3 @@ -# vim: tabstop=5 shiftwidth=4 softtabstop=4 - # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py index fc7165445772..7bfb8d76fef7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py +++ b/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Nicira, Inc. # All Rights Reserved # diff --git a/nova/tests/api/openstack/compute/contrib/test_quotas.py b/nova/tests/api/openstack/compute/contrib/test_quotas.py index 10c63713bf65..caa3aaaa8c15 100644 --- a/nova/tests/api/openstack/compute/contrib/test_quotas.py +++ b/nova/tests/api/openstack/compute/contrib/test_quotas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2013 IBM Corp. # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py index b90321d9421e..0d867b86452c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py +++ b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py b/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py index a25d246417f0..ad0bd6a8d71b 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py +++ b/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Metacloud, Inc # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py index 35a4405de471..5b35a899c79b 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2012 Justin Santa Barbara # diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py index b951ccb7d7a0..70b23254bcec 100644 --- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/contrib/test_used_limits.py b/nova/tests/api/openstack/compute/contrib/test_used_limits.py index 769d435e719a..1b58c0b1b6a2 100644 --- a/nova/tests/api/openstack/compute/contrib/test_used_limits.py +++ b/nova/tests/api/openstack/compute/contrib/test_used_limits.py @@ -1,5 +1,3 @@ -# vim: tabstop=5 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/extensions/__init__.py b/nova/tests/api/openstack/compute/extensions/__init__.py index 4ac574e5860b..153622e504b8 100644 --- a/nova/tests/api/openstack/compute/extensions/__init__.py +++ b/nova/tests/api/openstack/compute/extensions/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/api/openstack/compute/extensions/foxinsocks.py b/nova/tests/api/openstack/compute/extensions/foxinsocks.py index 3b232f327108..5785f1037a04 100644 --- a/nova/tests/api/openstack/compute/extensions/foxinsocks.py +++ b/nova/tests/api/openstack/compute/extensions/foxinsocks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_admin_password.py b/nova/tests/api/openstack/compute/plugins/v3/test_admin_password.py index cc8afc170845..8997ca4e36a5 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_admin_password.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_admin_password.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2013 IBM Corp. # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_block_device_mapping.py b/nova/tests/api/openstack/compute/plugins/v3/test_block_device_mapping.py index e37822e47344..14d5cd93a70e 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_block_device_mapping.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_block_device_mapping.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_consoles.py b/nova/tests/api/openstack/compute/plugins/v3/test_consoles.py index 6d355a8e753e..31012f7b14bf 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_consoles.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_consoles.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2011 Piston Cloud Computing, Inc. # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_deferred_delete.py b/nova/tests/api/openstack/compute/plugins/v3/test_deferred_delete.py index d3ef678a7a12..27bc24607ba9 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_deferred_delete.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_deferred_delete.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py b/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py index a4af98f5e6a2..77fb84085db2 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py b/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py index 81fb04f6c581..a4cb07f93c9d 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py index 4113dce3cf4b..92758ca953b8 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavors_extra_specs.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavors_extra_specs.py index dbfdd4eb81b2..f61f0f810e50 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_flavors_extra_specs.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavors_extra_specs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 University of Southern California # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_keypairs.py b/nova/tests/api/openstack/compute/plugins/v3/test_keypairs.py index 820a1a156fd8..388dc07771e3 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_keypairs.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_keypairs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Eldar Nugaev # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_migrations.py b/nova/tests/api/openstack/compute/plugins/v3/test_migrations.py index d1bcb7626cc5..6a18ac9cb220 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_migrations.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_migrations.py @@ -1,5 +1,3 @@ -# vim: tabstop=5 shiftwidth=4 softtabstop=4 - # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py b/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py index dc80fb799a73..c193212fcc24 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_pci.py b/nova/tests/api/openstack/compute/plugins/v3/test_pci.py index ae1238c35d22..db2ba810c71f 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_pci.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_pci.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Intel Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py b/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py index 327780884817..2313643d2e80 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2013 IBM Corp. # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_scheduler_hints.py b/nova/tests/api/openstack/compute/plugins/v3/test_scheduler_hints.py index 5f1383441648..92b8c16ce872 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_scheduler_hints.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_scheduler_hints.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py b/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py index c37c96f04e0f..fe5f0eca96d1 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2012 Justin Santa Barbara # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_metadata.py b/nova/tests/api/openstack/compute/plugins/v3/test_server_metadata.py index 1707805e1eb9..6fca7a81af4e 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_server_metadata.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_server_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py index 5a90fc4e3190..bcdb507faa78 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2011 Piston Cloud Computing, Inc. # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/plugins/v3/test_simple_tenant_usage.py index a8e9f39e720f..babb6b887502 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_simple_tenant_usage.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_simple_tenant_usage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_versions.py b/nova/tests/api/openstack/compute/plugins/v3/test_versions.py index d87d69e60399..dbb40b3e3d71 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_versions.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # Copyright 2010-2011 OpenStack Foundation # diff --git a/nova/tests/api/openstack/compute/test_api.py b/nova/tests/api/openstack/compute/test_api.py index 127faf5d3fb5..437458cac64b 100644 --- a/nova/tests/api/openstack/compute/test_api.py +++ b/nova/tests/api/openstack/compute/test_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/test_auth.py b/nova/tests/api/openstack/compute/test_auth.py index 80b2d63c3a5f..610212b1754a 100644 --- a/nova/tests/api/openstack/compute/test_auth.py +++ b/nova/tests/api/openstack/compute/test_auth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/api/openstack/compute/test_consoles.py index 3fcabeb0fcb2..ac844b1c617c 100644 --- a/nova/tests/api/openstack/compute/test_consoles.py +++ b/nova/tests/api/openstack/compute/test_consoles.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2011 Piston Cloud Computing, Inc. # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py index f6a476958005..891735edf125 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/api/openstack/compute/test_extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py index 932ac0d02bde..ec1f371ee593 100644 --- a/nova/tests/api/openstack/compute/test_flavors.py +++ b/nova/tests/api/openstack/compute/test_flavors.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/test_image_metadata.py b/nova/tests/api/openstack/compute/test_image_metadata.py index 2ecb811ff488..0add556b4432 100644 --- a/nova/tests/api/openstack/compute/test_image_metadata.py +++ b/nova/tests/api/openstack/compute/test_image_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py index 9bf4f7e35369..a5cdea40b904 100644 --- a/nova/tests/api/openstack/compute/test_images.py +++ b/nova/tests/api/openstack/compute/test_images.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/test_server_metadata.py b/nova/tests/api/openstack/compute/test_server_metadata.py index 9267d82b3518..49db155e496e 100644 --- a/nova/tests/api/openstack/compute/test_server_metadata.py +++ b/nova/tests/api/openstack/compute/test_server_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index f6839b38ccf1..22dc9d41030a 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2011 Piston Cloud Computing, Inc. # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/test_v3_auth.py b/nova/tests/api/openstack/compute/test_v3_auth.py index eec417ebd45e..15f80a169aa5 100644 --- a/nova/tests/api/openstack/compute/test_v3_auth.py +++ b/nova/tests/api/openstack/compute/test_v3_auth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # Copyright 2010 OpenStack Foundation # All Rights Reserved. diff --git a/nova/tests/api/openstack/compute/test_v3_extensions.py b/nova/tests/api/openstack/compute/test_v3_extensions.py index 0ff9bf55ca1e..b4159fb6ba39 100644 --- a/nova/tests/api/openstack/compute/test_v3_extensions.py +++ b/nova/tests/api/openstack/compute/test_v3_extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/api/openstack/compute/test_versions.py b/nova/tests/api/openstack/compute/test_versions.py index 60c3174f15ac..ee921605f523 100644 --- a/nova/tests/api/openstack/compute/test_versions.py +++ b/nova/tests/api/openstack/compute/test_versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py index c5cc166db4bc..266bc5a15092 100644 --- a/nova/tests/api/openstack/fakes.py +++ b/nova/tests/api/openstack/fakes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py index 5ae588bbbead..34c16032cf7e 100644 --- a/nova/tests/api/openstack/test_common.py +++ b/nova/tests/api/openstack/test_common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/api/openstack/test_faults.py index 338b6fe08aca..cb7e35e1642a 100644 --- a/nova/tests/api/openstack/test_faults.py +++ b/nova/tests/api/openstack/test_faults.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # Copyright 2010 OpenStack Foundation # All Rights Reserved. diff --git a/nova/tests/api/openstack/test_mapper.py b/nova/tests/api/openstack/test_mapper.py index e115a688bac1..99b53f384aad 100644 --- a/nova/tests/api/openstack/test_mapper.py +++ b/nova/tests/api/openstack/test_mapper.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py index 367cbcf6a071..018ee55f89ed 100644 --- a/nova/tests/api/openstack/test_wsgi.py +++ b/nova/tests/api/openstack/test_wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/tests/api/openstack/test_xmlutil.py b/nova/tests/api/openstack/test_xmlutil.py index 85f8e6e92791..75822a54edca 100644 --- a/nova/tests/api/openstack/test_xmlutil.py +++ b/nova/tests/api/openstack/test_xmlutil.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/api/test_validator.py b/nova/tests/api/test_validator.py index 8a2a25959bbe..eec09c3a0644 100644 --- a/nova/tests/api/test_validator.py +++ b/nova/tests/api/test_validator.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Cloudscaling, Inc. # Author: Matthew Hooker # All Rights Reserved. diff --git a/nova/tests/api/test_wsgi.py b/nova/tests/api/test_wsgi.py index 0e34fd8baacd..aecfb8e219fd 100644 --- a/nova/tests/api/test_wsgi.py +++ b/nova/tests/api/test_wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2010 OpenStack Foundation diff --git a/nova/tests/cast_as_call.py b/nova/tests/cast_as_call.py index 393da7a6815b..f75600a3b5ff 100644 --- a/nova/tests/cast_as_call.py +++ b/nova/tests/cast_as_call.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/cells/__init__.py b/nova/tests/cells/__init__.py index 22dfdf45f9b8..7085a89b0f6e 100644 --- a/nova/tests/cells/__init__.py +++ b/nova/tests/cells/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Rackspace Hosting # All Rights Reserved. # diff --git a/nova/tests/cert/__init__.py b/nova/tests/cert/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/cert/__init__.py +++ b/nova/tests/cert/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py index 1cf0c2cc6a79..ee20c477cd71 100644 --- a/nova/tests/cert/test_rpcapi.py +++ b/nova/tests/cert/test_rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012, Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/compute/__init__.py b/nova/tests/compute/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/compute/__init__.py +++ b/nova/tests/compute/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/compute/fake_resource_tracker.py b/nova/tests/compute/fake_resource_tracker.py index a940084f52e3..c8f1e14647e4 100644 --- a/nova/tests/compute/fake_resource_tracker.py +++ b/nova/tests/compute/fake_resource_tracker.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/compute/monitors/test_cpu_monitor.py b/nova/tests/compute/monitors/test_cpu_monitor.py index 3717e9498a1d..04977cd47fc5 100644 --- a/nova/tests/compute/monitors/test_cpu_monitor.py +++ b/nova/tests/compute/monitors/test_cpu_monitor.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Intel Corporation # All Rights Reserved. # diff --git a/nova/tests/compute/monitors/test_monitors.py b/nova/tests/compute/monitors/test_monitors.py index 4a8187082bc2..f52d4cec3708 100644 --- a/nova/tests/compute/monitors/test_monitors.py +++ b/nova/tests/compute/monitors/test_monitors.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Intel Corporation # All Rights Reserved. # diff --git a/nova/tests/compute/test_claims.py b/nova/tests/compute/test_claims.py index e94983598523..939f3086dc4c 100644 --- a/nova/tests/compute/test_claims.py +++ b/nova/tests/compute/test_claims.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 063985f4ce18..c625030315ca 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Piston Cloud Computing, Inc. diff --git a/nova/tests/compute/test_compute_cells.py b/nova/tests/compute/test_compute_cells.py index 21833cd920ba..a85ee35e2af2 100644 --- a/nova/tests/compute/test_compute_cells.py +++ b/nova/tests/compute/test_compute_cells.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2012 Rackspace Hosting # All Rights Reserved. # diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py index 2c07b49cc439..a3889438d143 100644 --- a/nova/tests/compute/test_compute_utils.py +++ b/nova/tests/compute/test_compute_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # Copyright 2013 Red Hat, Inc. diff --git a/nova/tests/compute/test_keypairs.py b/nova/tests/compute/test_keypairs.py index e9a67b68bc73..09c9b2733071 100644 --- a/nova/tests/compute/test_keypairs.py +++ b/nova/tests/compute/test_keypairs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/compute/test_multiple_nodes.py b/nova/tests/compute/test_multiple_nodes.py index ded5707e867a..57a32dbe4f75 100644 --- a/nova/tests/compute/test_multiple_nodes.py +++ b/nova/tests/compute/test_multiple_nodes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # All Rights Reserved. # diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index a3d6866b880b..ae325555e08d 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index edd2fc5ca94e..5218c797a818 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012, Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/compute/test_stats.py b/nova/tests/compute/test_stats.py index 1cf569ea9a10..866fa5450416 100644 --- a/nova/tests/compute/test_stats.py +++ b/nova/tests/compute/test_stats.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/compute/test_virtapi.py b/nova/tests/compute/test_virtapi.py index 4e59be01dd01..3dffe3f72b48 100644 --- a/nova/tests/compute/test_virtapi.py +++ b/nova/tests/compute/test_virtapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/compute/test_vmmode.py b/nova/tests/compute/test_vmmode.py index 0d10807ecf76..b8df6ed85344 100644 --- a/nova/tests/compute/test_vmmode.py +++ b/nova/tests/compute/test_vmmode.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (C) 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/conductor/tasks/test_live_migrate.py b/nova/tests/conductor/tasks/test_live_migrate.py index fa217bd594ca..6622a88bde61 100644 --- a/nova/tests/conductor/tasks/test_live_migrate.py +++ b/nova/tests/conductor/tasks/test_live_migrate.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py index aaea7c85a510..8631c8613896 100644 --- a/nova/tests/conf_fixture.py +++ b/nova/tests/conf_fixture.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/console/__init__.py b/nova/tests/console/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/console/__init__.py +++ b/nova/tests/console/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py index f58bd086d52f..b107cdf4feaf 100644 --- a/nova/tests/console/test_console.py +++ b/nova/tests/console/test_console.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/console/test_rpcapi.py index 10a673546f66..690c4bb103d8 100644 --- a/nova/tests/console/test_rpcapi.py +++ b/nova/tests/console/test_rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012, Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/consoleauth/__init__.py b/nova/tests/consoleauth/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/consoleauth/__init__.py +++ b/nova/tests/consoleauth/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py index 808e5ea1e618..299957daf28b 100644 --- a/nova/tests/consoleauth/test_consoleauth.py +++ b/nova/tests/consoleauth/test_consoleauth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/consoleauth/test_rpcapi.py b/nova/tests/consoleauth/test_rpcapi.py index 83684588b151..104b43bdab73 100644 --- a/nova/tests/consoleauth/test_rpcapi.py +++ b/nova/tests/consoleauth/test_rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/db/__init__.py b/nova/tests/db/__init__.py index 2d43aac42ffa..fdf33be94127 100644 --- a/nova/tests/db/__init__.py +++ b/nova/tests/db/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py index 5e2add9be7a6..c45b3729963a 100644 --- a/nova/tests/db/fakes.py +++ b/nova/tests/db/fakes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 OpenStack Foundation # All Rights Reserved. diff --git a/nova/tests/db/test_db_api.py b/nova/tests/db/test_db_api.py index 5527d9364df0..1a98905151ad 100644 --- a/nova/tests/db/test_db_api.py +++ b/nova/tests/db/test_db_api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # encoding=UTF8 # Copyright 2010 United States Government as represented by the diff --git a/nova/tests/db/test_migration_utils.py b/nova/tests/db/test_migration_utils.py index 11b642a2e0ff..7fd6fd621862 100644 --- a/nova/tests/db/test_migration_utils.py +++ b/nova/tests/db/test_migration_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Boris Pavlovic (boris@pavlovic.me). # All Rights Reserved. # diff --git a/nova/tests/db/test_migrations.py b/nova/tests/db/test_migrations.py index eb6dc41b84c3..0d9e49698627 100644 --- a/nova/tests/db/test_migrations.py +++ b/nova/tests/db/test_migrations.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2012-2013 IBM Corp. # All Rights Reserved. diff --git a/nova/tests/db/test_sqlalchemy_utils.py b/nova/tests/db/test_sqlalchemy_utils.py index b8443c52081f..88b8f071a12c 100644 --- a/nova/tests/db/test_sqlalchemy_utils.py +++ b/nova/tests/db/test_sqlalchemy_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/tests/db/test_sqlite.py b/nova/tests/db/test_sqlite.py index 1479180cbcac..3891ea72b443 100644 --- a/nova/tests/db/test_sqlite.py +++ b/nova/tests/db/test_sqlite.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2010 OpenStack Foundation diff --git a/nova/tests/fake_crypto.py b/nova/tests/fake_crypto.py index 31ece948e33c..cac79a36bc1e 100644 --- a/nova/tests/fake_crypto.py +++ b/nova/tests/fake_crypto.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Nebula, Inc. # All Rights Reserved. # diff --git a/nova/tests/fake_instance_actions.py b/nova/tests/fake_instance_actions.py index f3ab1f8ad14b..45f6bfadd454 100644 --- a/nova/tests/fake_instance_actions.py +++ b/nova/tests/fake_instance_actions.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 diff --git a/nova/tests/fake_ldap.py b/nova/tests/fake_ldap.py index ddaef8a5f887..e3e6d770802b 100644 --- a/nova/tests/fake_ldap.py +++ b/nova/tests/fake_ldap.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 53d3c8659cb5..b48473cf28f5 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Rackspace # All Rights Reserved. # diff --git a/nova/tests/fake_network_cache_model.py b/nova/tests/fake_network_cache_model.py index 2c1d0ad25ec1..9873f509d2a6 100644 --- a/nova/tests/fake_network_cache_model.py +++ b/nova/tests/fake_network_cache_model.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/fake_notifier.py b/nova/tests/fake_notifier.py index 4371e093b0b2..622a1fc40683 100644 --- a/nova/tests/fake_notifier.py +++ b/nova/tests/fake_notifier.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py index 2d76323406ef..8a188266083c 100644 --- a/nova/tests/fake_policy.py +++ b/nova/tests/fake_policy.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"); you may diff --git a/nova/tests/fake_processutils.py b/nova/tests/fake_processutils.py index 5a053e985d77..37fb367ac447 100644 --- a/nova/tests/fake_processutils.py +++ b/nova/tests/fake_processutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/fake_volume.py b/nova/tests/fake_volume.py index 54ed8e645245..607fb50d3fea 100644 --- a/nova/tests/fake_volume.py +++ b/nova/tests/fake_volume.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # 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 diff --git a/nova/tests/fakeguestfs.py b/nova/tests/fakeguestfs.py index cf35a6f01ad7..c9f85b5562f5 100644 --- a/nova/tests/fakeguestfs.py +++ b/nova/tests/fakeguestfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012 Red Hat, Inc # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/glance/__init__.py b/nova/tests/glance/__init__.py index ef9fa05a7ce8..eac840c7edb8 100644 --- a/nova/tests/glance/__init__.py +++ b/nova/tests/glance/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/glance/stubs.py b/nova/tests/glance/stubs.py index d8a288d04d33..b240d9ea1fec 100644 --- a/nova/tests/glance/stubs.py +++ b/nova/tests/glance/stubs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/image/__init__.py b/nova/tests/image/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/image/__init__.py +++ b/nova/tests/image/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py index 671eeef80314..0e8d3ac114b7 100644 --- a/nova/tests/image/fake.py +++ b/nova/tests/image/fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # Copyright 2012 OpenStack Foundation # All Rights Reserved. diff --git a/nova/tests/image/test_fake.py b/nova/tests/image/test_fake.py index fd7f773f6ba0..cdd7efdd6e03 100644 --- a/nova/tests/image/test_fake.py +++ b/nova/tests/image/test_fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Author: Soren Hansen # diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py index 80be48f4cb50..b550864cda69 100644 --- a/nova/tests/image/test_glance.py +++ b/nova/tests/image/test_glance.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/image/test_s3.py b/nova/tests/image/test_s3.py index 1fc64fb3eb46..b1749a86ed2c 100644 --- a/nova/tests/image/test_s3.py +++ b/nova/tests/image/test_s3.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Isaku Yamahata # All Rights Reserved. # diff --git a/nova/tests/integrated/__init__.py b/nova/tests/integrated/__init__.py index 10e0a91d77c8..16b4b921b7ec 100644 --- a/nova/tests/integrated/__init__.py +++ b/nova/tests/integrated/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Justin Santa Barbara # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/integrated/api/__init__.py b/nova/tests/integrated/api/__init__.py index 5798ab3d1e6d..6168280c2493 100644 --- a/nova/tests/integrated/api/__init__.py +++ b/nova/tests/integrated/api/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Justin Santa Barbara # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/integrated/api/client.py b/nova/tests/integrated/api/client.py index 1f31be9f13fe..71369f9331a4 100644 --- a/nova/tests/integrated/api/client.py +++ b/nova/tests/integrated/api/client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Justin Santa Barbara # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/integrated/api_samples_test_base.py b/nova/tests/integrated/api_samples_test_base.py index 712a25bcf3bc..6456be0502ea 100644 --- a/nova/tests/integrated/api_samples_test_base.py +++ b/nova/tests/integrated/api_samples_test_base.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py index eaf60495134b..17f923d9eeba 100644 --- a/nova/tests/integrated/integrated_helpers.py +++ b/nova/tests/integrated/integrated_helpers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 0c6d840883b1..a81ab20e7217 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py index 642d4fec69d4..e6bbb0ab0f14 100644 --- a/nova/tests/integrated/test_extensions.py +++ b/nova/tests/integrated/test_extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/nova/tests/integrated/test_login.py b/nova/tests/integrated/test_login.py index eafd7a1c0f5e..b0d2880ec8a1 100644 --- a/nova/tests/integrated/test_login.py +++ b/nova/tests/integrated/test_login.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py index 6332bec959e9..70082a49ef1b 100644 --- a/nova/tests/integrated/test_servers.py +++ b/nova/tests/integrated/test_servers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/nova/tests/integrated/test_xml.py b/nova/tests/integrated/test_xml.py index 22e0206c797a..af14ed66930c 100644 --- a/nova/tests/integrated/test_xml.py +++ b/nova/tests/integrated/test_xml.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/nova/tests/integrated/v3/api_sample_base.py b/nova/tests/integrated/v3/api_sample_base.py index aa1ca8f6a5b2..b211d243d2f2 100644 --- a/nova/tests/integrated/v3/api_sample_base.py +++ b/nova/tests/integrated/v3/api_sample_base.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/integrated/v3/test_access_ips.py b/nova/tests/integrated/v3/test_access_ips.py index 4a8f1cfc47bd..36af1e71e52a 100644 --- a/nova/tests/integrated/v3/test_access_ips.py +++ b/nova/tests/integrated/v3/test_access_ips.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_admin_actions.py b/nova/tests/integrated/v3/test_admin_actions.py index 0d5e961180bb..d76d5be1697d 100644 --- a/nova/tests/integrated/v3/test_admin_actions.py +++ b/nova/tests/integrated/v3/test_admin_actions.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_admin_password.py b/nova/tests/integrated/v3/test_admin_password.py index e4a267e17835..fb4a97e7a919 100644 --- a/nova/tests/integrated/v3/test_admin_password.py +++ b/nova/tests/integrated/v3/test_admin_password.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_agents.py b/nova/tests/integrated/v3/test_agents.py index 1045264cd5c3..0248e0743206 100644 --- a/nova/tests/integrated/v3/test_agents.py +++ b/nova/tests/integrated/v3/test_agents.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_aggregates.py b/nova/tests/integrated/v3/test_aggregates.py index 9fd3f8731fdc..6bae77396293 100644 --- a/nova/tests/integrated/v3/test_aggregates.py +++ b/nova/tests/integrated/v3/test_aggregates.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_attach_interfaces.py b/nova/tests/integrated/v3/test_attach_interfaces.py index 329e33f9b222..8ae31c08404e 100644 --- a/nova/tests/integrated/v3/test_attach_interfaces.py +++ b/nova/tests/integrated/v3/test_attach_interfaces.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_availability_zone.py b/nova/tests/integrated/v3/test_availability_zone.py index 155ee6f7a8c4..2e041f509666 100644 --- a/nova/tests/integrated/v3/test_availability_zone.py +++ b/nova/tests/integrated/v3/test_availability_zone.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/integrated/v3/test_cells.py b/nova/tests/integrated/v3/test_cells.py index b3680b9cccb0..ec09aa4cf619 100644 --- a/nova/tests/integrated/v3/test_cells.py +++ b/nova/tests/integrated/v3/test_cells.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_certificates.py b/nova/tests/integrated/v3/test_certificates.py index e296aa39b0a6..8ac77f270c25 100644 --- a/nova/tests/integrated/v3/test_certificates.py +++ b/nova/tests/integrated/v3/test_certificates.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_console_output.py b/nova/tests/integrated/v3/test_console_output.py index abdad92f13e2..47d39d64640b 100644 --- a/nova/tests/integrated/v3/test_console_output.py +++ b/nova/tests/integrated/v3/test_console_output.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_consoles.py b/nova/tests/integrated/v3/test_consoles.py index baec9f255c98..b113675490e8 100644 --- a/nova/tests/integrated/v3/test_consoles.py +++ b/nova/tests/integrated/v3/test_consoles.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_deferred_delete.py b/nova/tests/integrated/v3/test_deferred_delete.py index 656c83a0ceea..1d9df01f5c39 100644 --- a/nova/tests/integrated/v3/test_deferred_delete.py +++ b/nova/tests/integrated/v3/test_deferred_delete.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_evacuate.py b/nova/tests/integrated/v3/test_evacuate.py index 23dd03d78e90..d70506a8fe04 100644 --- a/nova/tests/integrated/v3/test_evacuate.py +++ b/nova/tests/integrated/v3/test_evacuate.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_extended_availability_zone.py b/nova/tests/integrated/v3/test_extended_availability_zone.py index f487b2a75ca2..631d46141d6d 100644 --- a/nova/tests/integrated/v3/test_extended_availability_zone.py +++ b/nova/tests/integrated/v3/test_extended_availability_zone.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_extended_server_attributes.py b/nova/tests/integrated/v3/test_extended_server_attributes.py index e823dfdd4741..36c70fddbda5 100644 --- a/nova/tests/integrated/v3/test_extended_server_attributes.py +++ b/nova/tests/integrated/v3/test_extended_server_attributes.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_extended_status.py b/nova/tests/integrated/v3/test_extended_status.py index 0eaaf3404c41..cbdb4fb4833d 100644 --- a/nova/tests/integrated/v3/test_extended_status.py +++ b/nova/tests/integrated/v3/test_extended_status.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_extended_volumes.py b/nova/tests/integrated/v3/test_extended_volumes.py index fc3827140779..455516105c68 100644 --- a/nova/tests/integrated/v3/test_extended_volumes.py +++ b/nova/tests/integrated/v3/test_extended_volumes.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_extension_info.py b/nova/tests/integrated/v3/test_extension_info.py index 2716173e2ad0..3c0402382c6e 100644 --- a/nova/tests/integrated/v3/test_extension_info.py +++ b/nova/tests/integrated/v3/test_extension_info.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_flavor_access.py b/nova/tests/integrated/v3/test_flavor_access.py index 34ffe1937ab8..3b8579512d20 100644 --- a/nova/tests/integrated/v3/test_flavor_access.py +++ b/nova/tests/integrated/v3/test_flavor_access.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/integrated/v3/test_flavor_extraspecs.py b/nova/tests/integrated/v3/test_flavor_extraspecs.py index 0daa04f303a9..09d6b98166da 100644 --- a/nova/tests/integrated/v3/test_flavor_extraspecs.py +++ b/nova/tests/integrated/v3/test_flavor_extraspecs.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_flavor_manage.py b/nova/tests/integrated/v3/test_flavor_manage.py index 208ba8e6103a..86ea48325bcb 100644 --- a/nova/tests/integrated/v3/test_flavor_manage.py +++ b/nova/tests/integrated/v3/test_flavor_manage.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_flavor_rxtx.py b/nova/tests/integrated/v3/test_flavor_rxtx.py index 3966339f6a48..ff506cf9fb03 100644 --- a/nova/tests/integrated/v3/test_flavor_rxtx.py +++ b/nova/tests/integrated/v3/test_flavor_rxtx.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_flavors.py b/nova/tests/integrated/v3/test_flavors.py index f32c03c034dc..c821bd4764a2 100644 --- a/nova/tests/integrated/v3/test_flavors.py +++ b/nova/tests/integrated/v3/test_flavors.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_hide_server_addresses.py b/nova/tests/integrated/v3/test_hide_server_addresses.py index 6f7ec33eec92..a530b70c8923 100644 --- a/nova/tests/integrated/v3/test_hide_server_addresses.py +++ b/nova/tests/integrated/v3/test_hide_server_addresses.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_hosts.py b/nova/tests/integrated/v3/test_hosts.py index e3570e90ef21..bf6818f8f6ce 100644 --- a/nova/tests/integrated/v3/test_hosts.py +++ b/nova/tests/integrated/v3/test_hosts.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_hypervisors.py b/nova/tests/integrated/v3/test_hypervisors.py index a61a516db564..c6120024f4a2 100644 --- a/nova/tests/integrated/v3/test_hypervisors.py +++ b/nova/tests/integrated/v3/test_hypervisors.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_instance_actions.py b/nova/tests/integrated/v3/test_instance_actions.py index 5408534db6c1..c0c2e783ead8 100644 --- a/nova/tests/integrated/v3/test_instance_actions.py +++ b/nova/tests/integrated/v3/test_instance_actions.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_instance_usage_audit_log.py b/nova/tests/integrated/v3/test_instance_usage_audit_log.py index 507e459f78a1..1340f6b3f3a8 100644 --- a/nova/tests/integrated/v3/test_instance_usage_audit_log.py +++ b/nova/tests/integrated/v3/test_instance_usage_audit_log.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_keypairs.py b/nova/tests/integrated/v3/test_keypairs.py index 85ab234f6bfc..bb47bcf6eebe 100644 --- a/nova/tests/integrated/v3/test_keypairs.py +++ b/nova/tests/integrated/v3/test_keypairs.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_migrations.py b/nova/tests/integrated/v3/test_migrations.py index a8e07644780f..f27e4ccaa240 100644 --- a/nova/tests/integrated/v3/test_migrations.py +++ b/nova/tests/integrated/v3/test_migrations.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_multinic.py b/nova/tests/integrated/v3/test_multinic.py index aea2ca20b331..6dfb05f69494 100644 --- a/nova/tests/integrated/v3/test_multinic.py +++ b/nova/tests/integrated/v3/test_multinic.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_pci.py b/nova/tests/integrated/v3/test_pci.py index 28899bcd571b..0faa79283ddd 100644 --- a/nova/tests/integrated/v3/test_pci.py +++ b/nova/tests/integrated/v3/test_pci.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 Intel. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/integrated/v3/test_quota_class_sets.py b/nova/tests/integrated/v3/test_quota_class_sets.py index 56c4e0676d2b..2a8b1a84f168 100644 --- a/nova/tests/integrated/v3/test_quota_class_sets.py +++ b/nova/tests/integrated/v3/test_quota_class_sets.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_quota_sets.py b/nova/tests/integrated/v3/test_quota_sets.py index 0618f6a8ca0b..3a6e4c1f6520 100644 --- a/nova/tests/integrated/v3/test_quota_sets.py +++ b/nova/tests/integrated/v3/test_quota_sets.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_remote_consoles.py b/nova/tests/integrated/v3/test_remote_consoles.py index 229b2558e45c..3d61b72df99d 100644 --- a/nova/tests/integrated/v3/test_remote_consoles.py +++ b/nova/tests/integrated/v3/test_remote_consoles.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_rescue.py b/nova/tests/integrated/v3/test_rescue.py index 56ef25904338..d47b94eac2c8 100644 --- a/nova/tests/integrated/v3/test_rescue.py +++ b/nova/tests/integrated/v3/test_rescue.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_scheduler_hints.py b/nova/tests/integrated/v3/test_scheduler_hints.py index 663750e496ee..a0b9b6186e8e 100644 --- a/nova/tests/integrated/v3/test_scheduler_hints.py +++ b/nova/tests/integrated/v3/test_scheduler_hints.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_security_groups.py b/nova/tests/integrated/v3/test_security_groups.py index 38c804031dbf..c1f27d5a46e2 100644 --- a/nova/tests/integrated/v3/test_security_groups.py +++ b/nova/tests/integrated/v3/test_security_groups.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_server_diagnostics.py b/nova/tests/integrated/v3/test_server_diagnostics.py index 832ac4eb64b2..51c0488f1f29 100644 --- a/nova/tests/integrated/v3/test_server_diagnostics.py +++ b/nova/tests/integrated/v3/test_server_diagnostics.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_server_metadata.py b/nova/tests/integrated/v3/test_server_metadata.py index 9e79260d3250..4db60bd0bb77 100644 --- a/nova/tests/integrated/v3/test_server_metadata.py +++ b/nova/tests/integrated/v3/test_server_metadata.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_server_usage.py b/nova/tests/integrated/v3/test_server_usage.py index 30b845f5a7cb..ae0c393e787c 100644 --- a/nova/tests/integrated/v3/test_server_usage.py +++ b/nova/tests/integrated/v3/test_server_usage.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_servers.py b/nova/tests/integrated/v3/test_servers.py index 6081eab43220..f33ade37d7a5 100644 --- a/nova/tests/integrated/v3/test_servers.py +++ b/nova/tests/integrated/v3/test_servers.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_servers_ips.py b/nova/tests/integrated/v3/test_servers_ips.py index 987fedffb07a..08cabe6a825a 100644 --- a/nova/tests/integrated/v3/test_servers_ips.py +++ b/nova/tests/integrated/v3/test_servers_ips.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_services.py b/nova/tests/integrated/v3/test_services.py index 3431146a3312..13a3174e7d81 100644 --- a/nova/tests/integrated/v3/test_services.py +++ b/nova/tests/integrated/v3/test_services.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_shelve.py b/nova/tests/integrated/v3/test_shelve.py index 0f19461ad6d4..78e1a70f3c98 100644 --- a/nova/tests/integrated/v3/test_shelve.py +++ b/nova/tests/integrated/v3/test_shelve.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_simple_tenant_usage.py b/nova/tests/integrated/v3/test_simple_tenant_usage.py index f2e10e3b5b83..3836ca534180 100644 --- a/nova/tests/integrated/v3/test_simple_tenant_usage.py +++ b/nova/tests/integrated/v3/test_simple_tenant_usage.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/integrated/v3/test_user_data.py b/nova/tests/integrated/v3/test_user_data.py index 0d6713a0182b..bdea92a8d8d6 100644 --- a/nova/tests/integrated/v3/test_user_data.py +++ b/nova/tests/integrated/v3/test_user_data.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Nebula, Inc. # Copyright 2013 IBM Corp. # diff --git a/nova/tests/keymgr/__init__.py b/nova/tests/keymgr/__init__.py index 33d5398ac89b..07fbbfe5ed23 100644 --- a/nova/tests/keymgr/__init__.py +++ b/nova/tests/keymgr/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/keymgr/fake.py b/nova/tests/keymgr/fake.py index c5a0cec4d6c3..25fb300c51bb 100644 --- a/nova/tests/keymgr/fake.py +++ b/nova/tests/keymgr/fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # Copyright 2012 OpenStack Foundation # All Rights Reserved. diff --git a/nova/tests/keymgr/test_conf_key_mgr.py b/nova/tests/keymgr/test_conf_key_mgr.py index 35e9eccfaf87..aeb9ed1142df 100644 --- a/nova/tests/keymgr/test_conf_key_mgr.py +++ b/nova/tests/keymgr/test_conf_key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/keymgr/test_key.py b/nova/tests/keymgr/test_key.py index 9b95832ab4f8..a086c6527c6b 100644 --- a/nova/tests/keymgr/test_key.py +++ b/nova/tests/keymgr/test_key.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/keymgr/test_key_mgr.py b/nova/tests/keymgr/test_key_mgr.py index 01e1867b287d..cffcfc7a0ce0 100644 --- a/nova/tests/keymgr/test_key_mgr.py +++ b/nova/tests/keymgr/test_key_mgr.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/keymgr/test_mock_key_mgr.py b/nova/tests/keymgr/test_mock_key_mgr.py index e749621df342..4c18158c8630 100644 --- a/nova/tests/keymgr/test_mock_key_mgr.py +++ b/nova/tests/keymgr/test_mock_key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/keymgr/test_not_implemented_key_mgr.py b/nova/tests/keymgr/test_not_implemented_key_mgr.py index 85bc9f22050c..dc2c98112338 100644 --- a/nova/tests/keymgr/test_not_implemented_key_mgr.py +++ b/nova/tests/keymgr/test_not_implemented_key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/keymgr/test_single_key_mgr.py b/nova/tests/keymgr/test_single_key_mgr.py index 19103240cbe0..8b595723fd57 100644 --- a/nova/tests/keymgr/test_single_key_mgr.py +++ b/nova/tests/keymgr/test_single_key_mgr.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/matchers.py b/nova/tests/matchers.py index cc02c611874a..6504fa6a8ab5 100644 --- a/nova/tests/matchers.py +++ b/nova/tests/matchers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/nova/tests/monkey_patch_example/__init__.py b/nova/tests/monkey_patch_example/__init__.py index 8eaaf41a1fda..bf0a9e4214bb 100644 --- a/nova/tests/monkey_patch_example/__init__.py +++ b/nova/tests/monkey_patch_example/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/monkey_patch_example/example_a.py b/nova/tests/monkey_patch_example/example_a.py index ae852a4068de..3fdb4dcc0562 100644 --- a/nova/tests/monkey_patch_example/example_a.py +++ b/nova/tests/monkey_patch_example/example_a.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/monkey_patch_example/example_b.py b/nova/tests/monkey_patch_example/example_b.py index 8a171834b018..2515fd2be4b9 100644 --- a/nova/tests/monkey_patch_example/example_b.py +++ b/nova/tests/monkey_patch_example/example_b.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/network/__init__.py b/nova/tests/network/__init__.py index 0b3d2db5e9d6..bf3075ddd8b7 100644 --- a/nova/tests/network/__init__.py +++ b/nova/tests/network/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/network/security_group/test_neutron_driver.py b/nova/tests/network/security_group/test_neutron_driver.py index 7bafa2c67972..0cc8ab3339ab 100644 --- a/nova/tests/network/security_group/test_neutron_driver.py +++ b/nova/tests/network/security_group/test_neutron_driver.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - import mox from neutronclient.common import exceptions as n_exc diff --git a/nova/tests/network/test_api.py b/nova/tests/network/test_api.py index 70c9bba0acb5..0e6b85ed9123 100644 --- a/nova/tests/network/test_api.py +++ b/nova/tests/network/test_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # All Rights Reserved. # diff --git a/nova/tests/network/test_ipam_lib.py b/nova/tests/network/test_ipam_lib.py index 10d5657a27ca..c58203643e96 100644 --- a/nova/tests/network/test_ipam_lib.py +++ b/nova/tests/network/test_ipam_lib.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # All Rights Reserved. # diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index aaa325a7bd61..41be0bf41212 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 NTT # All Rights Reserved. # diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index e2e25bbfaa5c..091ad7b9c9b3 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Rackspace # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2013 IBM Corp. diff --git a/nova/tests/network/test_network_info.py b/nova/tests/network/test_network_info.py index a9ca8f33912f..48f357d29187 100644 --- a/nova/tests/network/test_network_info.py +++ b/nova/tests/network/test_network_info.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # Copyright 2013 IBM Corp. diff --git a/nova/tests/network/test_neutronv2.py b/nova/tests/network/test_neutronv2.py index 8445f37c1cde..6908a2fadc62 100644 --- a/nova/tests/network/test_neutronv2.py +++ b/nova/tests/network/test_neutronv2.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - import copy import uuid diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py index 79b44a89344f..79070299282d 100644 --- a/nova/tests/network/test_rpcapi.py +++ b/nova/tests/network/test_rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/objects/test_instance_group.py b/nova/tests/objects/test_instance_group.py index 815d3c16c27a..fe343e0bc844 100644 --- a/nova/tests/objects/test_instance_group.py +++ b/nova/tests/objects/test_instance_group.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"); you may diff --git a/nova/tests/objects/test_pci_device.py b/nova/tests/objects/test_pci_device.py index 3d73926e83c8..3af784fa8221 100644 --- a/nova/tests/objects/test_pci_device.py +++ b/nova/tests/objects/test_pci_device.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/pci/test_pci_manager.py b/nova/tests/pci/test_pci_manager.py index 3c58dcbcabb5..1fb3bcfee1a9 100644 --- a/nova/tests/pci/test_pci_manager.py +++ b/nova/tests/pci/test_pci_manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/pci/test_pci_request.py b/nova/tests/pci/test_pci_request.py index af06c4c9ea20..69b1d9f98a94 100644 --- a/nova/tests/pci/test_pci_request.py +++ b/nova/tests/pci/test_pci_request.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Intel Corporation # All Rights Reserved. # diff --git a/nova/tests/pci/test_pci_stats.py b/nova/tests/pci/test_pci_stats.py index a5757405ae15..9104e2ea9ec4 100644 --- a/nova/tests/pci/test_pci_stats.py +++ b/nova/tests/pci/test_pci_stats.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/pci/test_pci_utils.py b/nova/tests/pci/test_pci_utils.py index 2ea12db5d99a..d904dc925406 100644 --- a/nova/tests/pci/test_pci_utils.py +++ b/nova/tests/pci/test_pci_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Intel, Inc. # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. diff --git a/nova/tests/pci/test_pci_whitelist.py b/nova/tests/pci/test_pci_whitelist.py index deff6ffae015..0b737eb7bb37 100644 --- a/nova/tests/pci/test_pci_whitelist.py +++ b/nova/tests/pci/test_pci_whitelist.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/scheduler/__init__.py b/nova/tests/scheduler/__init__.py index 4dec227c40fb..31285c4fc215 100644 --- a/nova/tests/scheduler/__init__.py +++ b/nova/tests/scheduler/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/scheduler/test_chance_scheduler.py b/nova/tests/scheduler/test_chance_scheduler.py index cc27003bb861..a9b23331108b 100644 --- a/nova/tests/scheduler/test_chance_scheduler.py +++ b/nova/tests/scheduler/test_chance_scheduler.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index c77f9014c8c8..5a71c7859ad5 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index 15e3cc767948..fa1a931c34b1 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/test_api_validation.py b/nova/tests/test_api_validation.py index 68d16ad17270..04d657acc7af 100644 --- a/nova/tests/test_api_validation.py +++ b/nova/tests/test_api_validation.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 NEC Corporation. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_availability_zones.py b/nova/tests/test_availability_zones.py index c8b725d4be9e..d7766d1ad1ef 100644 --- a/nova/tests/test_availability_zones.py +++ b/nova/tests/test_availability_zones.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Netease Corporation # All Rights Reserved. # diff --git a/nova/tests/test_bdm.py b/nova/tests/test_bdm.py index eff33e2f4f5a..31ec68b87acd 100644 --- a/nova/tests/test_bdm.py +++ b/nova/tests/test_bdm.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Isaku Yamahata # All Rights Reserved. # diff --git a/nova/tests/test_block_device.py b/nova/tests/test_block_device.py index dec338019875..3ce1e9600d89 100644 --- a/nova/tests/test_block_device.py +++ b/nova/tests/test_block_device.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Isaku Yamahata # All Rights Reserved. # diff --git a/nova/tests/test_cinder.py b/nova/tests/test_cinder.py index 6e66ccf6cc8d..1e3966d174ee 100644 --- a/nova/tests/test_cinder.py +++ b/nova/tests/test_cinder.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py index 4231250b0933..81cb764fd488 100644 --- a/nova/tests/test_configdrive2.py +++ b/nova/tests/test_configdrive2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still and Canonical Inc # All Rights Reserved. # diff --git a/nova/tests/test_context.py b/nova/tests/test_context.py index 5de84c545fa1..773f9e77f5f3 100644 --- a/nova/tests/test_context.py +++ b/nova/tests/test_context.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_exception.py b/nova/tests/test_exception.py index e112efd937b3..b7d5ce937c5e 100644 --- a/nova/tests/test_exception.py +++ b/nova/tests/test_exception.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/test_flavors.py b/nova/tests/test_flavors.py index 64395dd35a6e..eb1d238d491f 100644 --- a/nova/tests/test_flavors.py +++ b/nova/tests/test_flavors.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Ken Pepple # 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 diff --git a/nova/tests/test_hooks.py b/nova/tests/test_hooks.py index f2a1fb3bb847..f14f9551e5d0 100644 --- a/nova/tests/test_hooks.py +++ b/nova/tests/test_hooks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/test_instance_types_extra_specs.py b/nova/tests/test_instance_types_extra_specs.py index 14ab309b4133..52e1617d1fe7 100644 --- a/nova/tests/test_instance_types_extra_specs.py +++ b/nova/tests/test_instance_types_extra_specs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 University of Southern California # 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 diff --git a/nova/tests/test_iptables_network.py b/nova/tests/test_iptables_network.py index 5780c4f27735..1d46bc1254ea 100644 --- a/nova/tests/test_iptables_network.py +++ b/nova/tests/test_iptables_network.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/test_ipv6.py b/nova/tests/test_ipv6.py index b307fe0caf41..4aa6c2a80334 100644 --- a/nova/tests/test_ipv6.py +++ b/nova/tests/test_ipv6.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_linuxscsi.py b/nova/tests/test_linuxscsi.py index 9ff906320434..c291e4590852 100644 --- a/nova/tests/test_linuxscsi.py +++ b/nova/tests/test_linuxscsi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack Foundation # (c) Copyright 2012-2013 Hewlett-Packard Development Company, L.P. # diff --git a/nova/tests/test_matchers.py b/nova/tests/test_matchers.py index 89216c0f16ce..0e4596244121 100644 --- a/nova/tests/test_matchers.py +++ b/nova/tests/test_matchers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 92cf5ffeb125..c1eea7bbadd3 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index ad4481f62d8d..4432054dbe78 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index a6395dca4b7f..bdd0f24c2c4d 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2011 Ilya Alekseyev # diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py index 5e01247b4e7c..e66bd9fad9f0 100644 --- a/nova/tests/test_objectstore.py +++ b/nova/tests/test_objectstore.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/test_policy.py b/nova/tests/test_policy.py index c64329ab4320..b38ecf2a9b51 100644 --- a/nova/tests/test_policy.py +++ b/nova/tests/test_policy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Piston Cloud Computing, Inc. # All Rights Reserved. diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index ac5c61a6a9bd..09addf271977 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/test_safeutils.py b/nova/tests/test_safeutils.py index ff8bd1bba8aa..e42ddea5c5a0 100644 --- a/nova/tests/test_safeutils.py +++ b/nova/tests/test_safeutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py index b0af961440e0..c315ac38ce29 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/test_service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/test_test.py b/nova/tests/test_test.py index 4789fb458d47..170c7bc9cf2d 100644 --- a/nova/tests/test_test.py +++ b/nova/tests/test_test.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/test_test_utils.py b/nova/tests/test_test_utils.py index 2184d39af834..39e1185cd6d3 100644 --- a/nova/tests/test_test_utils.py +++ b/nova/tests/test_test_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index e6ca1620a0da..c04194d2ef4e 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_versions.py b/nova/tests/test_versions.py index fd3130afa0c5..06baca8b0577 100644 --- a/nova/tests/test_versions.py +++ b/nova/tests/test_versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Ken Pepple # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py index 5a76ded53c6f..cb59b910668f 100644 --- a/nova/tests/test_wsgi.py +++ b/nova/tests/test_wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/tests/utils.py b/nova/tests/utils.py index d3ffcd5b4424..0fe93786b2db 100644 --- a/nova/tests/utils.py +++ b/nova/tests/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/baremetal/test_driver.py b/nova/tests/virt/baremetal/test_driver.py index c9b052cde7ea..fa03a70e6c75 100644 --- a/nova/tests/virt/baremetal/test_driver.py +++ b/nova/tests/virt/baremetal/test_driver.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/nova/tests/virt/baremetal/test_iboot_pdu.py b/nova/tests/virt/baremetal/test_iboot_pdu.py index 4853df5d2fd2..3f99cf995e59 100644 --- a/nova/tests/virt/baremetal/test_iboot_pdu.py +++ b/nova/tests/virt/baremetal/test_iboot_pdu.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat Inc. # All Rights Reserved. # diff --git a/nova/tests/virt/baremetal/test_ipmi.py b/nova/tests/virt/baremetal/test_ipmi.py index ea63221e4dc9..8872ab034c48 100644 --- a/nova/tests/virt/baremetal/test_ipmi.py +++ b/nova/tests/virt/baremetal/test_ipmi.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/nova/tests/virt/baremetal/test_nova_baremetal_deploy_helper.py b/nova/tests/virt/baremetal/test_nova_baremetal_deploy_helper.py index a5e2a1658e8f..4937bbec1dad 100644 --- a/nova/tests/virt/baremetal/test_nova_baremetal_deploy_helper.py +++ b/nova/tests/virt/baremetal/test_nova_baremetal_deploy_helper.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright 2011 OpenStack Foundation # Copyright 2011 Ilya Alekseyev diff --git a/nova/tests/virt/baremetal/test_nova_baremetal_manage.py b/nova/tests/virt/baremetal/test_nova_baremetal_manage.py index 6651e6ad42de..cca8757db4ec 100644 --- a/nova/tests/virt/baremetal/test_nova_baremetal_manage.py +++ b/nova/tests/virt/baremetal/test_nova_baremetal_manage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright 2011 OpenStack Foundation # Copyright 2011 Ilya Alekseyev diff --git a/nova/tests/virt/baremetal/test_pxe.py b/nova/tests/virt/baremetal/test_pxe.py index bb88bbf4d6dc..21e0322c8f6c 100644 --- a/nova/tests/virt/baremetal/test_pxe.py +++ b/nova/tests/virt/baremetal/test_pxe.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/nova/tests/virt/baremetal/test_tilera.py b/nova/tests/virt/baremetal/test_tilera.py index ac47fff40d8a..5fea40ca86d5 100644 --- a/nova/tests/virt/baremetal/test_tilera.py +++ b/nova/tests/virt/baremetal/test_tilera.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright (c) 2011-2013 University of Southern California / ISI diff --git a/nova/tests/virt/baremetal/test_tilera_pdu.py b/nova/tests/virt/baremetal/test_tilera_pdu.py index 47fe10176e9d..62ffd0ec6805 100644 --- a/nova/tests/virt/baremetal/test_tilera_pdu.py +++ b/nova/tests/virt/baremetal/test_tilera_pdu.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright (c) 2011-2013 University of Southern California / ISI diff --git a/nova/tests/virt/baremetal/test_utils.py b/nova/tests/virt/baremetal/test_utils.py index c719aff4937a..393051ee9138 100644 --- a/nova/tests/virt/baremetal/test_utils.py +++ b/nova/tests/virt/baremetal/test_utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/nova/tests/virt/baremetal/test_virtual_power_driver.py b/nova/tests/virt/baremetal/test_virtual_power_driver.py index 2dc9ae05ef8b..d51239d4312f 100644 --- a/nova/tests/virt/baremetal/test_virtual_power_driver.py +++ b/nova/tests/virt/baremetal/test_virtual_power_driver.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/nova/tests/virt/disk/__init__.py b/nova/tests/virt/disk/__init__.py index e07f7d34817e..b0ed88fcaa89 100644 --- a/nova/tests/virt/disk/__init__.py +++ b/nova/tests/virt/disk/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still # All Rights Reserved. # diff --git a/nova/tests/virt/disk/test_api.py b/nova/tests/virt/disk/test_api.py index 4995b9261789..fd4e61eafb38 100644 --- a/nova/tests/virt/disk/test_api.py +++ b/nova/tests/virt/disk/test_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/disk/test_loop.py b/nova/tests/virt/disk/test_loop.py index 4b220771526d..6375c9386b81 100644 --- a/nova/tests/virt/disk/test_loop.py +++ b/nova/tests/virt/disk/test_loop.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still # All Rights Reserved. # diff --git a/nova/tests/virt/disk/test_nbd.py b/nova/tests/virt/disk/test_nbd.py index 2841f9dbeb52..d048511d1699 100644 --- a/nova/tests/virt/disk/test_nbd.py +++ b/nova/tests/virt/disk/test_nbd.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still and Canonical Inc # All Rights Reserved. # diff --git a/nova/tests/virt/docker/mock_client.py b/nova/tests/virt/docker/mock_client.py index dd6652d85663..be7a22c4972b 100644 --- a/nova/tests/virt/docker/mock_client.py +++ b/nova/tests/virt/docker/mock_client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 dotCloud, Inc. # All Rights Reserved. # diff --git a/nova/tests/virt/docker/test_docker_client.py b/nova/tests/virt/docker/test_docker_client.py index 9ac7edcd32a9..a70e58ea8d8d 100644 --- a/nova/tests/virt/docker/test_docker_client.py +++ b/nova/tests/virt/docker/test_docker_client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 dotCloud, Inc. # All Rights Reserved. # diff --git a/nova/tests/virt/docker/test_driver.py b/nova/tests/virt/docker/test_driver.py index 0d911d848b0d..1f8cf958d7db 100644 --- a/nova/tests/virt/docker/test_driver.py +++ b/nova/tests/virt/docker/test_driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 dotCloud, Inc. # All Rights Reserved. # diff --git a/nova/tests/virt/docker/test_hostinfo.py b/nova/tests/virt/docker/test_hostinfo.py index d878278fa74d..88329691ca59 100644 --- a/nova/tests/virt/docker/test_hostinfo.py +++ b/nova/tests/virt/docker/test_hostinfo.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 dotCloud, Inc. # All Rights Reserved. # diff --git a/nova/tests/virt/docker/test_network.py b/nova/tests/virt/docker/test_network.py index 8606ae6b0fac..c4996800fa4c 100644 --- a/nova/tests/virt/docker/test_network.py +++ b/nova/tests/virt/docker/test_network.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2014 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/hyperv/__init__.py b/nova/tests/virt/hyperv/__init__.py index 090fc0639e1f..fdcde82bdb6d 100644 --- a/nova/tests/virt/hyperv/__init__.py +++ b/nova/tests/virt/hyperv/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/tests/virt/hyperv/db_fakes.py b/nova/tests/virt/hyperv/db_fakes.py index 0e3bd2f9b526..53607352bde4 100644 --- a/nova/tests/virt/hyperv/db_fakes.py +++ b/nova/tests/virt/hyperv/db_fakes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudbase Solutions Srl # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/hyperv/fake.py b/nova/tests/virt/hyperv/fake.py index f48e4741db37..f1d29a5546db 100644 --- a/nova/tests/virt/hyperv/fake.py +++ b/nova/tests/virt/hyperv/fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/tests/virt/hyperv/test_hypervapi.py b/nova/tests/virt/hyperv/test_hypervapi.py index d162d3ed2153..a51670343f14 100644 --- a/nova/tests/virt/hyperv/test_hypervapi.py +++ b/nova/tests/virt/hyperv/test_hypervapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudbase Solutions Srl # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/hyperv/test_networkutilsv2.py b/nova/tests/virt/hyperv/test_networkutilsv2.py index bc7aab8d97c9..8949db8b3245 100644 --- a/nova/tests/virt/hyperv/test_networkutilsv2.py +++ b/nova/tests/virt/hyperv/test_networkutilsv2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/hyperv/test_vhdutils.py b/nova/tests/virt/hyperv/test_vhdutils.py index 0902c55f0034..62758ff527ca 100644 --- a/nova/tests/virt/hyperv/test_vhdutils.py +++ b/nova/tests/virt/hyperv/test_vhdutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/hyperv/test_vhdutilsv2.py b/nova/tests/virt/hyperv/test_vhdutilsv2.py index 9c94845ce749..fc4852482c3e 100644 --- a/nova/tests/virt/hyperv/test_vhdutilsv2.py +++ b/nova/tests/virt/hyperv/test_vhdutilsv2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/hyperv/test_vmutils.py b/nova/tests/virt/hyperv/test_vmutils.py index 7ee806201ba8..5d02568dd93e 100644 --- a/nova/tests/virt/hyperv/test_vmutils.py +++ b/nova/tests/virt/hyperv/test_vmutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/tests/virt/hyperv/test_vmutilsv2.py b/nova/tests/virt/hyperv/test_vmutilsv2.py index f261c57164ca..1f1b6866bff8 100644 --- a/nova/tests/virt/hyperv/test_vmutilsv2.py +++ b/nova/tests/virt/hyperv/test_vmutilsv2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/libvirt/__init__.py b/nova/tests/virt/libvirt/__init__.py index a02a201771ad..4de47e9de188 100644 --- a/nova/tests/virt/libvirt/__init__.py +++ b/nova/tests/virt/libvirt/__init__.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"); you may diff --git a/nova/tests/virt/libvirt/fake_imagebackend.py b/nova/tests/virt/libvirt/fake_imagebackend.py index 96600d69ce07..ef09fdcc52c0 100644 --- a/nova/tests/virt/libvirt/fake_imagebackend.py +++ b/nova/tests/virt/libvirt/fake_imagebackend.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Grid Dynamics # All Rights Reserved. # diff --git a/nova/tests/virt/libvirt/fake_libvirt_utils.py b/nova/tests/virt/libvirt/fake_libvirt_utils.py index 5b19219d7675..606b7e6d4fd6 100644 --- a/nova/tests/virt/libvirt/fake_libvirt_utils.py +++ b/nova/tests/virt/libvirt/fake_libvirt_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/libvirt/fakelibvirt.py b/nova/tests/virt/libvirt/fakelibvirt.py index ee64936d8aa0..aa245af75df3 100644 --- a/nova/tests/virt/libvirt/fakelibvirt.py +++ b/nova/tests/virt/libvirt/fakelibvirt.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/libvirt/test_fakelibvirt.py b/nova/tests/virt/libvirt/test_fakelibvirt.py index 0fbb4224f40e..3378fd8be55d 100644 --- a/nova/tests/virt/libvirt/test_fakelibvirt.py +++ b/nova/tests/virt/libvirt/test_fakelibvirt.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/libvirt/test_image_utils.py b/nova/tests/virt/libvirt/test_image_utils.py index d6e6df3dde5a..26813355f3ba 100644 --- a/nova/tests/virt/libvirt/test_image_utils.py +++ b/nova/tests/virt/libvirt/test_image_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (C) 2012 Yahoo! Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/libvirt/test_imagebackend.py b/nova/tests/virt/libvirt/test_imagebackend.py index 2448999f3645..34c2149af459 100644 --- a/nova/tests/virt/libvirt/test_imagebackend.py +++ b/nova/tests/virt/libvirt/test_imagebackend.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Grid Dynamics # All Rights Reserved. # diff --git a/nova/tests/virt/libvirt/test_imagecache.py b/nova/tests/virt/libvirt/test_imagecache.py index 99a3c06f310f..cac2344aa8dc 100644 --- a/nova/tests/virt/libvirt/test_imagecache.py +++ b/nova/tests/virt/libvirt/test_imagecache.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still and Canonical Inc # All Rights Reserved. # diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py index b365e5a802f3..59c1becb492f 100644 --- a/nova/tests/virt/libvirt/test_libvirt.py +++ b/nova/tests/virt/libvirt/test_libvirt.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack Foundation # Copyright 2012 University Of Minho # diff --git a/nova/tests/virt/libvirt/test_libvirt_blockinfo.py b/nova/tests/virt/libvirt/test_libvirt_blockinfo.py index f3dd9007841e..20c857f627fb 100644 --- a/nova/tests/virt/libvirt/test_libvirt_blockinfo.py +++ b/nova/tests/virt/libvirt/test_libvirt_blockinfo.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack Foundation # Copyright 2012 University Of Minho # diff --git a/nova/tests/virt/libvirt/test_libvirt_config.py b/nova/tests/virt/libvirt/test_libvirt_config.py index c858bfd59b57..ae71152ea8b7 100644 --- a/nova/tests/virt/libvirt/test_libvirt_config.py +++ b/nova/tests/virt/libvirt/test_libvirt_config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (C) 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/libvirt/test_libvirt_utils.py b/nova/tests/virt/libvirt/test_libvirt_utils.py index 9b5bdbb73d87..3a78124fe87c 100644 --- a/nova/tests/virt/libvirt/test_libvirt_utils.py +++ b/nova/tests/virt/libvirt/test_libvirt_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012 NTT Data # All Rights Reserved. # diff --git a/nova/tests/virt/libvirt/test_libvirt_vif.py b/nova/tests/virt/libvirt/test_libvirt_vif.py index 551b88ce3abb..118ddc639d59 100644 --- a/nova/tests/virt/libvirt/test_libvirt_vif.py +++ b/nova/tests/virt/libvirt/test_libvirt_vif.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012 Nicira, Inc # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/libvirt/test_libvirt_volume.py b/nova/tests/virt/libvirt/test_libvirt_volume.py index 78855287aabe..93706cf2c498 100644 --- a/nova/tests/virt/libvirt/test_libvirt_volume.py +++ b/nova/tests/virt/libvirt/test_libvirt_volume.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack Foundation # Copyright 2012 University Of Minho # diff --git a/nova/tests/virt/test_block_device.py b/nova/tests/virt/test_block_device.py index 99c16c23980e..724b6dfa65b7 100644 --- a/nova/tests/virt/test_block_device.py +++ b/nova/tests/virt/test_block_device.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/test_cpu.py b/nova/tests/virt/test_cpu.py index fb97c408a979..2f41fbe28428 100644 --- a/nova/tests/virt/test_cpu.py +++ b/nova/tests/virt/test_cpu.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/test_driver.py b/nova/tests/virt/test_driver.py index 200ee477a915..4101a6a9cecb 100644 --- a/nova/tests/virt/test_driver.py +++ b/nova/tests/virt/test_driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Citrix Systems, Inc. # Copyright 2013 OpenStack Foundation # diff --git a/nova/tests/virt/test_virt.py b/nova/tests/virt/test_virt.py index 4851b6f040cf..cd4708202a54 100644 --- a/nova/tests/virt/test_virt.py +++ b/nova/tests/virt/test_virt.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Isaku Yamahata # All Rights Reserved. # diff --git a/nova/tests/virt/test_virt_disk.py b/nova/tests/virt/test_virt_disk.py index 59d666e4cc2d..9dda7fffd96d 100644 --- a/nova/tests/virt/test_virt_disk.py +++ b/nova/tests/virt/test_virt_disk.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (C) 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/test_virt_disk_vfs_guestfs.py b/nova/tests/virt/test_virt_disk_vfs_guestfs.py index 185445fef0f6..53e5d48b1db4 100644 --- a/nova/tests/virt/test_virt_disk_vfs_guestfs.py +++ b/nova/tests/virt/test_virt_disk_vfs_guestfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (C) 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/test_virt_disk_vfs_localfs.py b/nova/tests/virt/test_virt_disk_vfs_localfs.py index c3730ae8a977..a81294f16a1e 100644 --- a/nova/tests/virt/test_virt_disk_vfs_localfs.py +++ b/nova/tests/virt/test_virt_disk_vfs_localfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (C) 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/test_virt_drivers.py b/nova/tests/virt/test_virt_drivers.py index 377b5178a14f..138ce03528a4 100644 --- a/nova/tests/virt/test_virt_drivers.py +++ b/nova/tests/virt/test_virt_drivers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/vmwareapi/__init__.py b/nova/tests/virt/vmwareapi/__init__.py index fcf71c88ddfe..baa6c7c61348 100644 --- a/nova/tests/virt/vmwareapi/__init__.py +++ b/nova/tests/virt/vmwareapi/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/tests/virt/vmwareapi/db_fakes.py b/nova/tests/virt/vmwareapi/db_fakes.py index b30ce0190e64..1fa473040aff 100644 --- a/nova/tests/virt/vmwareapi/db_fakes.py +++ b/nova/tests/virt/vmwareapi/db_fakes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation diff --git a/nova/tests/virt/vmwareapi/stubs.py b/nova/tests/virt/vmwareapi/stubs.py index d5b2a3d8c5d2..7e896a34ac09 100644 --- a/nova/tests/virt/vmwareapi/stubs.py +++ b/nova/tests/virt/vmwareapi/stubs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/tests/virt/vmwareapi/test_configdrive.py b/nova/tests/virt/vmwareapi/test_configdrive.py index 5965f2f58347..f4f03b02b3a8 100644 --- a/nova/tests/virt/vmwareapi/test_configdrive.py +++ b/nova/tests/virt/vmwareapi/test_configdrive.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # Copyright 2011 OpenStack Foundation # diff --git a/nova/tests/virt/vmwareapi/test_driver_api.py b/nova/tests/virt/vmwareapi/test_driver_api.py index e5b0328c6507..ee8d3c5623b9 100644 --- a/nova/tests/virt/vmwareapi/test_driver_api.py +++ b/nova/tests/virt/vmwareapi/test_driver_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. diff --git a/nova/tests/virt/vmwareapi/test_error_util.py b/nova/tests/virt/vmwareapi/test_error_util.py index 8dfbcc898af3..b5089f8a416d 100644 --- a/nova/tests/virt/vmwareapi/test_error_util.py +++ b/nova/tests/virt/vmwareapi/test_error_util.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 diff --git a/nova/tests/virt/vmwareapi/test_read_write_util.py b/nova/tests/virt/vmwareapi/test_read_write_util.py index 9ae65d760fc2..216dd9806d6f 100644 --- a/nova/tests/virt/vmwareapi/test_read_write_util.py +++ b/nova/tests/virt/vmwareapi/test_read_write_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # Copyright 2011 OpenStack Foundation # diff --git a/nova/tests/virt/vmwareapi/test_vif.py b/nova/tests/virt/vmwareapi/test_vif.py index 1520f6690c75..8aec6f8a48fe 100644 --- a/nova/tests/virt/vmwareapi/test_vif.py +++ b/nova/tests/virt/vmwareapi/test_vif.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Canonical Corp. # All Rights Reserved. # diff --git a/nova/tests/virt/vmwareapi/test_vim_util.py b/nova/tests/virt/vmwareapi/test_vim_util.py index 495ee4a47b3f..70dd19292fe1 100644 --- a/nova/tests/virt/vmwareapi/test_vim_util.py +++ b/nova/tests/virt/vmwareapi/test_vim_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 VMware, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/vmwareapi/test_vm_util.py b/nova/tests/virt/vmwareapi/test_vm_util.py index 55dd5e56f231..f700586c7c52 100644 --- a/nova/tests/virt/vmwareapi/test_vm_util.py +++ b/nova/tests/virt/vmwareapi/test_vm_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright 2013 Canonical Corp. # All Rights Reserved. diff --git a/nova/tests/virt/vmwareapi/test_vm_util_datastore_selection.py b/nova/tests/virt/vmwareapi/test_vm_util_datastore_selection.py index 3eea752a52b8..0dcd61716f0c 100644 --- a/nova/tests/virt/vmwareapi/test_vm_util_datastore_selection.py +++ b/nova/tests/virt/vmwareapi/test_vm_util_datastore_selection.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # # 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 diff --git a/nova/tests/virt/vmwareapi/test_vmops.py b/nova/tests/virt/vmwareapi/test_vmops.py index fe7fbeffaf01..40d54481c905 100644 --- a/nova/tests/virt/vmwareapi/test_vmops.py +++ b/nova/tests/virt/vmwareapi/test_vmops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/vmwareapi/test_volumeops.py b/nova/tests/virt/vmwareapi/test_volumeops.py index 3d5d831380e4..4e87592b6a07 100644 --- a/nova/tests/virt/vmwareapi/test_volumeops.py +++ b/nova/tests/virt/vmwareapi/test_volumeops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=43 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/xenapi/image/test_bittorrent.py b/nova/tests/virt/xenapi/image/test_bittorrent.py index 97b21cad43c7..85832791e634 100644 --- a/nova/tests/virt/xenapi/image/test_bittorrent.py +++ b/nova/tests/virt/xenapi/image/test_bittorrent.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/xenapi/image/test_glance.py b/nova/tests/virt/xenapi/image/test_glance.py index 7203ac4d5df5..c6f90322d18c 100644 --- a/nova/tests/virt/xenapi/image/test_glance.py +++ b/nova/tests/virt/xenapi/image/test_glance.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/xenapi/image/test_utils.py b/nova/tests/virt/xenapi/image/test_utils.py index f34822465502..ac4474e6941a 100644 --- a/nova/tests/virt/xenapi/image/test_utils.py +++ b/nova/tests/virt/xenapi/image/test_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/xenapi/image/test_vdi_through_dev.py b/nova/tests/virt/xenapi/image/test_vdi_through_dev.py index bb05d7b4ac3a..7ffd9a9593a0 100644 --- a/nova/tests/virt/xenapi/image/test_vdi_through_dev.py +++ b/nova/tests/virt/xenapi/image/test_vdi_through_dev.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/xenapi/stubs.py b/nova/tests/virt/xenapi/stubs.py index 6f6e16cd8554..3ad289d1c67b 100644 --- a/nova/tests/virt/xenapi/stubs.py +++ b/nova/tests/virt/xenapi/stubs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/xenapi/test_agent.py b/nova/tests/virt/xenapi/test_agent.py index cec843521c26..07f3382e86d9 100644 --- a/nova/tests/virt/xenapi/test_agent.py +++ b/nova/tests/virt/xenapi/test_agent.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/xenapi/test_driver.py b/nova/tests/virt/xenapi/test_driver.py index 2289905307d5..8e3823c56b7f 100644 --- a/nova/tests/virt/xenapi/test_driver.py +++ b/nova/tests/virt/xenapi/test_driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Rackspace Hosting # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/xenapi/test_vm_utils.py b/nova/tests/virt/xenapi/test_vm_utils.py index 5e773b495044..f0731c7e913d 100644 --- a/nova/tests/virt/xenapi/test_vm_utils.py +++ b/nova/tests/virt/xenapi/test_vm_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/xenapi/test_vmops.py b/nova/tests/virt/xenapi/test_vmops.py index cca0e6889c69..a52c90574896 100644 --- a/nova/tests/virt/xenapi/test_vmops.py +++ b/nova/tests/virt/xenapi/test_vmops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/xenapi/test_volume_utils.py b/nova/tests/virt/xenapi/test_volume_utils.py index 7607b554f7ff..2acbaac102f2 100644 --- a/nova/tests/virt/xenapi/test_volume_utils.py +++ b/nova/tests/virt/xenapi/test_volume_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/tests/virt/xenapi/test_volumeops.py b/nova/tests/virt/xenapi/test_volumeops.py index ee2d018de5d6..d79469e8eb9c 100644 --- a/nova/tests/virt/xenapi/test_volumeops.py +++ b/nova/tests/virt/xenapi/test_volumeops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/virt/xenapi/test_xenapi.py b/nova/tests/virt/xenapi/test_xenapi.py index 3dec8aa14f58..1104c467ffb1 100644 --- a/nova/tests/virt/xenapi/test_xenapi.py +++ b/nova/tests/virt/xenapi/test_xenapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/volume/encryptors/__init__.py b/nova/tests/volume/encryptors/__init__.py index 0ee375701908..07fbbfe5ed23 100644 --- a/nova/tests/volume/encryptors/__init__.py +++ b/nova/tests/volume/encryptors/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/volume/encryptors/test_base.py b/nova/tests/volume/encryptors/test_base.py index aad1f1138135..648149c088ec 100644 --- a/nova/tests/volume/encryptors/test_base.py +++ b/nova/tests/volume/encryptors/test_base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/volume/encryptors/test_cryptsetup.py b/nova/tests/volume/encryptors/test_cryptsetup.py index eaca2998136b..5ed64217fcda 100644 --- a/nova/tests/volume/encryptors/test_cryptsetup.py +++ b/nova/tests/volume/encryptors/test_cryptsetup.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/volume/encryptors/test_luks.py b/nova/tests/volume/encryptors/test_luks.py index 2db7e77637cf..8958c3948135 100644 --- a/nova/tests/volume/encryptors/test_luks.py +++ b/nova/tests/volume/encryptors/test_luks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/volume/encryptors/test_nop.py b/nova/tests/volume/encryptors/test_nop.py index ff813d473eef..87e15854ef07 100644 --- a/nova/tests/volume/encryptors/test_nop.py +++ b/nova/tests/volume/encryptors/test_nop.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/tests/volume/test_cinder.py b/nova/tests/volume/test_cinder.py index fe42fa2c00cd..c12bdc2dc866 100644 --- a/nova/tests/volume/test_cinder.py +++ b/nova/tests/volume/test_cinder.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Mirantis, Inc. # Copyright 2013 OpenStack Foundation # diff --git a/nova/utils.py b/nova/utils.py index b8cf911f6d01..307b0b6c7574 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/nova/version.py b/nova/version.py index 01b6b47658d7..4d6faa1e081c 100644 --- a/nova/version.py +++ b/nova/version.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/__init__.py b/nova/virt/__init__.py index 3d598c463cc0..2ac96be0fa53 100644 --- a/nova/virt/__init__.py +++ b/nova/virt/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/baremetal/baremetal_states.py b/nova/virt/baremetal/baremetal_states.py index 6c5eca7f6816..e48382f5b608 100644 --- a/nova/virt/baremetal/baremetal_states.py +++ b/nova/virt/baremetal/baremetal_states.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright 2010 OpenStack Foundation # All Rights Reserved. diff --git a/nova/virt/baremetal/base.py b/nova/virt/baremetal/base.py index b76a6f00fb58..9553260287c2 100644 --- a/nova/virt/baremetal/base.py +++ b/nova/virt/baremetal/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright (c) 2011 University of Southern California / ISI # All Rights Reserved. diff --git a/nova/virt/baremetal/common.py b/nova/virt/baremetal/common.py index 6aa0a617aa9a..de0f6d8e0c12 100644 --- a/nova/virt/baremetal/common.py +++ b/nova/virt/baremetal/common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/baremetal/db/api.py b/nova/virt/baremetal/db/api.py index 3943b79026d1..e7592c1ea06d 100644 --- a/nova/virt/baremetal/db/api.py +++ b/nova/virt/baremetal/db/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the diff --git a/nova/virt/baremetal/db/migration.py b/nova/virt/baremetal/db/migration.py index bb96d5cecef8..eaa43ca3e629 100644 --- a/nova/virt/baremetal/db/migration.py +++ b/nova/virt/baremetal/db/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/baremetal/db/sqlalchemy/api.py b/nova/virt/baremetal/db/sqlalchemy/api.py index fe281d8779cd..53918ec1705e 100644 --- a/nova/virt/baremetal/db/sqlalchemy/api.py +++ b/nova/virt/baremetal/db/sqlalchemy/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py index e4fc8e5cabdc..0cf0b637abcb 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # All Rights Reserved. # diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py index a9fc649e2a6b..ae9f477b7b3b 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py index 778719096f01..12c97e1ffcaa 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py index 6f85b9cec261..fec8054f23ee 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/005_drop_unused_columns_from_nodes.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/005_drop_unused_columns_from_nodes.py index cb361f9478a1..5247b920da01 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/005_drop_unused_columns_from_nodes.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/005_drop_unused_columns_from_nodes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 NTT DOCOMO, INC. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/006_move_prov_mac_address.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/006_move_prov_mac_address.py index 1bd5345d0df9..5a1ec451a0f3 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/006_move_prov_mac_address.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/006_move_prov_mac_address.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 NTT DOCOMO, INC. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/007_drop_prov_mac_address.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/007_drop_prov_mac_address.py index eb6ae756c14d..a1c3568cad75 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/007_drop_prov_mac_address.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/007_drop_prov_mac_address.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 NTT DOCOMO, INC. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/008_remove_bm_pxe_ips_table.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/008_remove_bm_pxe_ips_table.py index 22b45c48029a..66e5e3d6bbcc 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/008_remove_bm_pxe_ips_table.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/008_remove_bm_pxe_ips_table.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Mirantis Inc. # All Rights Reserved # diff --git a/nova/virt/baremetal/db/sqlalchemy/migration.py b/nova/virt/baremetal/db/sqlalchemy/migration.py index d243f75f6888..39212e668c53 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migration.py +++ b/nova/virt/baremetal/db/sqlalchemy/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/baremetal/db/sqlalchemy/models.py b/nova/virt/baremetal/db/sqlalchemy/models.py index 9d7a523a7658..5125d7d3872a 100644 --- a/nova/virt/baremetal/db/sqlalchemy/models.py +++ b/nova/virt/baremetal/db/sqlalchemy/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # All Rights Reserved. # diff --git a/nova/virt/baremetal/db/sqlalchemy/session.py b/nova/virt/baremetal/db/sqlalchemy/session.py index fc045d5ca3ad..33823bb777f7 100644 --- a/nova/virt/baremetal/db/sqlalchemy/session.py +++ b/nova/virt/baremetal/db/sqlalchemy/session.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py index 85fab113a103..90e1ff072b9f 100644 --- a/nova/virt/baremetal/driver.py +++ b/nova/virt/baremetal/driver.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # Copyright (c) 2012 NTT DOCOMO, INC diff --git a/nova/virt/baremetal/fake.py b/nova/virt/baremetal/fake.py index 7de82eb50efe..952549ec5fea 100644 --- a/nova/virt/baremetal/fake.py +++ b/nova/virt/baremetal/fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright (c) 2011 University of Southern California / ISI # All Rights Reserved. diff --git a/nova/virt/baremetal/iboot_pdu.py b/nova/virt/baremetal/iboot_pdu.py index 134905f595a4..dc2400a1152f 100644 --- a/nova/virt/baremetal/iboot_pdu.py +++ b/nova/virt/baremetal/iboot_pdu.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat Inc. # All Rights Reserved. # diff --git a/nova/virt/baremetal/ipmi.py b/nova/virt/baremetal/ipmi.py index dff90bcda078..0cb50ffa4e8b 100644 --- a/nova/virt/baremetal/ipmi.py +++ b/nova/virt/baremetal/ipmi.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/nova/virt/baremetal/pxe.py b/nova/virt/baremetal/pxe.py index 6ce757309d7b..e484e04c75be 100644 --- a/nova/virt/baremetal/pxe.py +++ b/nova/virt/baremetal/pxe.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 NTT DOCOMO, INC. # All Rights Reserved. diff --git a/nova/virt/baremetal/tilera.py b/nova/virt/baremetal/tilera.py index 2532a5f247df..206bb7aaef44 100644 --- a/nova/virt/baremetal/tilera.py +++ b/nova/virt/baremetal/tilera.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011-2013 University of Southern California / ISI # All Rights Reserved. # diff --git a/nova/virt/baremetal/tilera_pdu.py b/nova/virt/baremetal/tilera_pdu.py index e09acde72184..6c09d9ea4517 100644 --- a/nova/virt/baremetal/tilera_pdu.py +++ b/nova/virt/baremetal/tilera_pdu.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright (c) 2011-2013 University of Southern California / ISI diff --git a/nova/virt/baremetal/utils.py b/nova/virt/baremetal/utils.py index 7e1376dc01ed..dab9265f8545 100644 --- a/nova/virt/baremetal/utils.py +++ b/nova/virt/baremetal/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # All Rights Reserved. # diff --git a/nova/virt/baremetal/virtual_power_driver.py b/nova/virt/baremetal/virtual_power_driver.py index 95ccb8b97778..f474dbc3ea9d 100644 --- a/nova/virt/baremetal/virtual_power_driver.py +++ b/nova/virt/baremetal/virtual_power_driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/nova/virt/baremetal/virtual_power_driver_settings.py b/nova/virt/baremetal/virtual_power_driver_settings.py index 781bf5bf98bf..e17883328583 100644 --- a/nova/virt/baremetal/virtual_power_driver_settings.py +++ b/nova/virt/baremetal/virtual_power_driver_settings.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Hewlett-Packard Development Company, L.P. # All Rights Reserved. diff --git a/nova/virt/baremetal/volume_driver.py b/nova/virt/baremetal/volume_driver.py index 28c4b332149f..a8b98b622325 100644 --- a/nova/virt/baremetal/volume_driver.py +++ b/nova/virt/baremetal/volume_driver.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright (c) 2012 NTT DOCOMO, INC. diff --git a/nova/virt/block_device.py b/nova/virt/block_device.py index f0c7c3573a89..bcbfd5e705a3 100644 --- a/nova/virt/block_device.py +++ b/nova/virt/block_device.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index 31fb1db050cf..b8824cdff880 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still and Canonical Inc # All Rights Reserved. # diff --git a/nova/virt/cpu.py b/nova/virt/cpu.py index e92a1e7de5bc..1935462730e0 100644 --- a/nova/virt/cpu.py +++ b/nova/virt/cpu.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/virt/disk/__init__.py b/nova/virt/disk/__init__.py index 4be6e49ceb9f..37bd884d18d9 100644 --- a/nova/virt/disk/__init__.py +++ b/nova/virt/disk/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 33ad2da43194..f7a20c52f5a7 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # diff --git a/nova/virt/disk/mount/__init__.py b/nova/virt/disk/mount/__init__.py index 5c18da32dec6..8612ef049cad 100644 --- a/nova/virt/disk/mount/__init__.py +++ b/nova/virt/disk/mount/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/disk/mount/api.py b/nova/virt/disk/mount/api.py index 6a545b7000d5..4ab9620fe104 100644 --- a/nova/virt/disk/mount/api.py +++ b/nova/virt/disk/mount/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/disk/mount/loop.py b/nova/virt/disk/mount/loop.py index 24fbe65b1fad..5b236431803c 100644 --- a/nova/virt/disk/mount/loop.py +++ b/nova/virt/disk/mount/loop.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/disk/mount/nbd.py b/nova/virt/disk/mount/nbd.py index ab1dd7316423..d6288491d832 100644 --- a/nova/virt/disk/mount/nbd.py +++ b/nova/virt/disk/mount/nbd.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/disk/vfs/__init__.py b/nova/virt/disk/vfs/__init__.py index 880979c48e31..e840b34714cd 100644 --- a/nova/virt/disk/vfs/__init__.py +++ b/nova/virt/disk/vfs/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/disk/vfs/api.py b/nova/virt/disk/vfs/api.py index 6071989d794d..34810504f548 100644 --- a/nova/virt/disk/vfs/api.py +++ b/nova/virt/disk/vfs/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/disk/vfs/guestfs.py b/nova/virt/disk/vfs/guestfs.py index 828b9e099f44..55f8d736c9ec 100644 --- a/nova/virt/disk/vfs/guestfs.py +++ b/nova/virt/disk/vfs/guestfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/disk/vfs/localfs.py b/nova/virt/disk/vfs/localfs.py index 8742de8072c8..cca6f88b0e93 100644 --- a/nova/virt/disk/vfs/localfs.py +++ b/nova/virt/disk/vfs/localfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/docker/__init__.py b/nova/virt/docker/__init__.py index a2e1e158b0c4..93544a79561b 100644 --- a/nova/virt/docker/__init__.py +++ b/nova/virt/docker/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 dotCloud, Inc. # All Rights Reserved. # diff --git a/nova/virt/docker/client.py b/nova/virt/docker/client.py index 41799fde1916..07ef2ff1cd14 100644 --- a/nova/virt/docker/client.py +++ b/nova/virt/docker/client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 dotCloud, Inc. # All Rights Reserved. # diff --git a/nova/virt/docker/driver.py b/nova/virt/docker/driver.py index 6ace7c20381b..678326feb17d 100644 --- a/nova/virt/docker/driver.py +++ b/nova/virt/docker/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 dotCloud, Inc. # All Rights Reserved. # diff --git a/nova/virt/docker/hostinfo.py b/nova/virt/docker/hostinfo.py index 12dada4ce7df..84fd670eae21 100644 --- a/nova/virt/docker/hostinfo.py +++ b/nova/virt/docker/hostinfo.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 dotCloud, Inc. # All Rights Reserved. # diff --git a/nova/virt/docker/network.py b/nova/virt/docker/network.py index c8b83dff7bbd..9c8f6156e18f 100644 --- a/nova/virt/docker/network.py +++ b/nova/virt/docker/network.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 4cf03bc4fdda..2ffeb0be2aec 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/nova/virt/event.py b/nova/virt/event.py index 63089549c2f2..bf7fa3fcfca0 100644 --- a/nova/virt/event.py +++ b/nova/virt/event.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 071c801dd777..33dd6874374e 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 42bd37afe48f..ebc4b207ee65 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/hyperv/__init__.py b/nova/virt/hyperv/__init__.py index 090fc0639e1f..fdcde82bdb6d 100644 --- a/nova/virt/hyperv/__init__.py +++ b/nova/virt/hyperv/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/basevolumeutils.py b/nova/virt/hyperv/basevolumeutils.py index ff8e6722f25c..d518e846674f 100644 --- a/nova/virt/hyperv/basevolumeutils.py +++ b/nova/virt/hyperv/basevolumeutils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Copyright 2012 Pedro Navarro Perez # Copyright 2013 Cloudbase Solutions Srl diff --git a/nova/virt/hyperv/constants.py b/nova/virt/hyperv/constants.py index 37c6ba1ea535..fc12ca9c75ea 100644 --- a/nova/virt/hyperv/constants.py +++ b/nova/virt/hyperv/constants.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py index 1d473ab8d480..ddcb826c2522 100644 --- a/nova/virt/hyperv/driver.py +++ b/nova/virt/hyperv/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Cloud.com, Inc # Copyright (c) 2012 Cloudbase Solutions Srl # diff --git a/nova/virt/hyperv/hostops.py b/nova/virt/hyperv/hostops.py index 7408f55fda3e..95d6a75b123f 100644 --- a/nova/virt/hyperv/hostops.py +++ b/nova/virt/hyperv/hostops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/hostutils.py b/nova/virt/hyperv/hostutils.py index 155444b82000..0a9bfdcaf7a2 100644 --- a/nova/virt/hyperv/hostutils.py +++ b/nova/virt/hyperv/hostutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/imagecache.py b/nova/virt/hyperv/imagecache.py index 2b3eacc27c50..16d7f766cf80 100644 --- a/nova/virt/hyperv/imagecache.py +++ b/nova/virt/hyperv/imagecache.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/livemigrationops.py b/nova/virt/hyperv/livemigrationops.py index dbd2c0804f5e..60d4b2298af0 100644 --- a/nova/virt/hyperv/livemigrationops.py +++ b/nova/virt/hyperv/livemigrationops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/livemigrationutils.py b/nova/virt/hyperv/livemigrationutils.py index 2cd70bfb0345..bc8398729d1f 100644 --- a/nova/virt/hyperv/livemigrationutils.py +++ b/nova/virt/hyperv/livemigrationutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/migrationops.py b/nova/virt/hyperv/migrationops.py index 6eb536092e89..79fce3d880f3 100644 --- a/nova/virt/hyperv/migrationops.py +++ b/nova/virt/hyperv/migrationops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/networkutils.py b/nova/virt/hyperv/networkutils.py index e48d76282cf3..2b45343b8ac8 100644 --- a/nova/virt/hyperv/networkutils.py +++ b/nova/virt/hyperv/networkutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/networkutilsv2.py b/nova/virt/hyperv/networkutilsv2.py index c8dd1913bf89..c3ec6a349713 100644 --- a/nova/virt/hyperv/networkutilsv2.py +++ b/nova/virt/hyperv/networkutilsv2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/pathutils.py b/nova/virt/hyperv/pathutils.py index 74064fdf363c..346dbfde8151 100644 --- a/nova/virt/hyperv/pathutils.py +++ b/nova/virt/hyperv/pathutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/snapshotops.py b/nova/virt/hyperv/snapshotops.py index ec10341f164d..38a84d589652 100644 --- a/nova/virt/hyperv/snapshotops.py +++ b/nova/virt/hyperv/snapshotops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/utilsfactory.py b/nova/virt/hyperv/utilsfactory.py index f41b42a4e43c..884181f54c6e 100644 --- a/nova/virt/hyperv/utilsfactory.py +++ b/nova/virt/hyperv/utilsfactory.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/vhdutils.py b/nova/virt/hyperv/vhdutils.py index 3ea377fb3ed3..41c405abcc8c 100644 --- a/nova/virt/hyperv/vhdutils.py +++ b/nova/virt/hyperv/vhdutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/vhdutilsv2.py b/nova/virt/hyperv/vhdutilsv2.py index 946758b3f422..df95ede400e9 100644 --- a/nova/virt/hyperv/vhdutilsv2.py +++ b/nova/virt/hyperv/vhdutilsv2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/vif.py b/nova/virt/hyperv/vif.py index f372b1c097c2..dbf23794e721 100644 --- a/nova/virt/hyperv/vif.py +++ b/nova/virt/hyperv/vif.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Cloudbase Solutions Srl # Copyright 2013 Pedro Navarro Perez # All Rights Reserved. diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py index cfc5f81397d2..cf05c14f9bc4 100644 --- a/nova/virt/hyperv/vmops.py +++ b/nova/virt/hyperv/vmops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Cloud.com, Inc # Copyright 2012 Cloudbase Solutions Srl # All Rights Reserved. diff --git a/nova/virt/hyperv/vmutils.py b/nova/virt/hyperv/vmutils.py index 554ea292bce4..80bf2b87b849 100644 --- a/nova/virt/hyperv/vmutils.py +++ b/nova/virt/hyperv/vmutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Cloud.com, Inc # Copyright 2012 Cloudbase Solutions Srl / Pedro Navarro Perez # All Rights Reserved. diff --git a/nova/virt/hyperv/vmutilsv2.py b/nova/virt/hyperv/vmutilsv2.py index 0ddf44980144..b3e3aa3caf16 100644 --- a/nova/virt/hyperv/vmutilsv2.py +++ b/nova/virt/hyperv/vmutilsv2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py index 47728d12869b..230f6debdf93 100644 --- a/nova/virt/hyperv/volumeops.py +++ b/nova/virt/hyperv/volumeops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Pedro Navarro Perez # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. diff --git a/nova/virt/hyperv/volumeutils.py b/nova/virt/hyperv/volumeutils.py index a32ff5ed67f8..992a5202edbb 100644 --- a/nova/virt/hyperv/volumeutils.py +++ b/nova/virt/hyperv/volumeutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012 Pedro Navarro Perez # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. diff --git a/nova/virt/hyperv/volumeutilsv2.py b/nova/virt/hyperv/volumeutilsv2.py index c92cac7f3458..c3a691c46012 100644 --- a/nova/virt/hyperv/volumeutilsv2.py +++ b/nova/virt/hyperv/volumeutilsv2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012 Pedro Navarro Perez # Copyright 2013 Cloudbase Solutions Srl # All Rights Reserved. diff --git a/nova/virt/imagecache.py b/nova/virt/imagecache.py index e77690a133cf..b63013f6b04c 100644 --- a/nova/virt/imagecache.py +++ b/nova/virt/imagecache.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/virt/images.py b/nova/virt/images.py index e4815ed03855..6b2394403512 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/libvirt/__init__.py b/nova/virt/libvirt/__init__.py index 784cf92d3361..cd8b69186f4d 100644 --- a/nova/virt/libvirt/__init__.py +++ b/nova/virt/libvirt/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index 072adef6d935..52482629f9a6 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (C) 2012-2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py index f3cf54bf39b0..62a3b3d75d56 100644 --- a/nova/virt/libvirt/config.py +++ b/nova/virt/libvirt/config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (C) 2012-2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/libvirt/designer.py b/nova/virt/libvirt/designer.py index bb229fc67f19..25e2a1c401d4 100644 --- a/nova/virt/libvirt/designer.py +++ b/nova/virt/libvirt/designer.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (C) 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 3a255bfb4249..07403abf9786 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py index c2dffb5284b5..cfb25d231453 100644 --- a/nova/virt/libvirt/firewall.py +++ b/nova/virt/libvirt/firewall.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index 0dabd4d379de..33e064b1dcf5 100644 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Grid Dynamics # All Rights Reserved. # diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py index bba39fc6dc7b..b68689b14dfe 100644 --- a/nova/virt/libvirt/imagecache.py +++ b/nova/virt/libvirt/imagecache.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still and Canonical Inc # All Rights Reserved. # diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index b5cb04c13e17..88a34bbcc773 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index e705c06dde2b..7fd1665be402 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (C) 2011 Midokura KK # Copyright (C) 2011 Nicira, Inc # Copyright 2011 OpenStack Foundation diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index a8299a0822c6..da8b36416794 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # (c) Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py index caf67e3ba722..a4bc773ac795 100644 --- a/nova/virt/netutils.py +++ b/nova/virt/netutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/storage_users.py b/nova/virt/storage_users.py index 2d754b2af738..d0dc8048a668 100644 --- a/nova/virt/storage_users.py +++ b/nova/virt/storage_users.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still and Canonical Inc # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/virtapi.py b/nova/virt/virtapi.py index 09bed39730fc..66e24a84b12a 100644 --- a/nova/virt/virtapi.py +++ b/nova/virt/virtapi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/vmwareapi/__init__.py b/nova/virt/vmwareapi/__init__.py index c299938fff9b..9fdf6a7b8dbd 100644 --- a/nova/virt/vmwareapi/__init__.py +++ b/nova/virt/vmwareapi/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 47e3517a64d8..486c3ef75b89 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. diff --git a/nova/virt/vmwareapi/error_util.py b/nova/virt/vmwareapi/error_util.py index c96eb1ebdff6..ce9920fd55c6 100644 --- a/nova/virt/vmwareapi/error_util.py +++ b/nova/virt/vmwareapi/error_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/virt/vmwareapi/fake.py b/nova/virt/vmwareapi/fake.py index 30526433feba..e1f92d8c7cd8 100644 --- a/nova/virt/vmwareapi/fake.py +++ b/nova/virt/vmwareapi/fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. diff --git a/nova/virt/vmwareapi/host.py b/nova/virt/vmwareapi/host.py index 945626a9dda3..e95437c88140 100644 --- a/nova/virt/vmwareapi/host.py +++ b/nova/virt/vmwareapi/host.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # diff --git a/nova/virt/vmwareapi/io_util.py b/nova/virt/vmwareapi/io_util.py index 50fda9980ca7..1c7a2bdf07b9 100644 --- a/nova/virt/vmwareapi/io_util.py +++ b/nova/virt/vmwareapi/io_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation diff --git a/nova/virt/vmwareapi/network_util.py b/nova/virt/vmwareapi/network_util.py index 6fa47e9a51f2..5e3c240143f2 100644 --- a/nova/virt/vmwareapi/network_util.py +++ b/nova/virt/vmwareapi/network_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation diff --git a/nova/virt/vmwareapi/read_write_util.py b/nova/virt/vmwareapi/read_write_util.py index ac90e8a08ed2..5812aed2c52d 100644 --- a/nova/virt/vmwareapi/read_write_util.py +++ b/nova/virt/vmwareapi/read_write_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py index c4bd19e07ac5..d22610a59f84 100644 --- a/nova/virt/vmwareapi/vif.py +++ b/nova/virt/vmwareapi/vif.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/virt/vmwareapi/vim.py b/nova/virt/vmwareapi/vim.py index 5933cf678d7c..95876ef02ebe 100644 --- a/nova/virt/vmwareapi/vim.py +++ b/nova/virt/vmwareapi/vim.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation diff --git a/nova/virt/vmwareapi/vim_util.py b/nova/virt/vmwareapi/vim_util.py index e0ab56f5aa4e..1ac52d3251b1 100644 --- a/nova/virt/vmwareapi/vim_util.py +++ b/nova/virt/vmwareapi/vim_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py index 411b70321bf1..924c07e1b306 100644 --- a/nova/virt/vmwareapi/vm_util.py +++ b/nova/virt/vmwareapi/vm_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py index 698741dda796..d9aa1d5434bf 100644 --- a/nova/virt/vmwareapi/vmops.py +++ b/nova/virt/vmwareapi/vmops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. diff --git a/nova/virt/vmwareapi/vmware_images.py b/nova/virt/vmwareapi/vmware_images.py index b23cc10209b2..d36a0a64ecc6 100644 --- a/nova/virt/vmwareapi/vmware_images.py +++ b/nova/virt/vmwareapi/vmware_images.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation diff --git a/nova/virt/vmwareapi/volume_util.py b/nova/virt/vmwareapi/volume_util.py index 85ce0f573212..01465f146461 100644 --- a/nova/virt/vmwareapi/volume_util.py +++ b/nova/virt/vmwareapi/volume_util.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 VMware, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/vmwareapi/volumeops.py b/nova/virt/vmwareapi/volumeops.py index 3f51d30e19dc..937904bb9146 100644 --- a/nova/virt/vmwareapi/volumeops.py +++ b/nova/virt/vmwareapi/volumeops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # diff --git a/nova/virt/xenapi/__init__.py b/nova/virt/xenapi/__init__.py index 3853f09f2cf8..2e9a5d372d8f 100644 --- a/nova/virt/xenapi/__init__.py +++ b/nova/virt/xenapi/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py index 881eaef38bb5..2b4495dfe6ea 100644 --- a/nova/virt/xenapi/agent.py +++ b/nova/virt/xenapi/agent.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # Copyright 2010-2012 OpenStack Foundation # diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index dba79cf939e7..efcded9ee99a 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2010 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/xenapi/firewall.py b/nova/virt/xenapi/firewall.py index 904955d6a50b..b1b2f9f77c2a 100644 --- a/nova/virt/xenapi/firewall.py +++ b/nova/virt/xenapi/firewall.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/virt/xenapi/host.py b/nova/virt/xenapi/host.py index 3226d4db5b09..7ec4563ab9e2 100644 --- a/nova/virt/xenapi/host.py +++ b/nova/virt/xenapi/host.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Citrix Systems, Inc. # Copyright 2010 OpenStack Foundation # diff --git a/nova/virt/xenapi/image/utils.py b/nova/virt/xenapi/image/utils.py index 5bb994c26ed8..c9db667b1f79 100644 --- a/nova/virt/xenapi/image/utils.py +++ b/nova/virt/xenapi/image/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/virt/xenapi/image/vdi_through_dev.py b/nova/virt/xenapi/image/vdi_through_dev.py index e6ccdb186cb6..c14155047e29 100644 --- a/nova/virt/xenapi/image/vdi_through_dev.py +++ b/nova/virt/xenapi/image/vdi_through_dev.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/virt/xenapi/network_utils.py b/nova/virt/xenapi/network_utils.py index 2a6d9e1cad78..2dcb43883230 100644 --- a/nova/virt/xenapi/network_utils.py +++ b/nova/virt/xenapi/network_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py index c3850f93b5a8..490675579462 100644 --- a/nova/virt/xenapi/pool.py +++ b/nova/virt/xenapi/pool.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Citrix Systems, Inc. # Copyright 2010 OpenStack Foundation # diff --git a/nova/virt/xenapi/pool_states.py b/nova/virt/xenapi/pool_states.py index f2ec02c1d9b2..ae431ddecb4d 100644 --- a/nova/virt/xenapi/pool_states.py +++ b/nova/virt/xenapi/pool_states.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py index 1b9cd5b32710..f38cab7ba2ca 100644 --- a/nova/virt/xenapi/vif.py +++ b/nova/virt/xenapi/vif.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # Copyright (C) 2011 Nicira, Inc diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index c4d76ca04032..5f7a4e00506a 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # Copyright 2011 Piston Cloud Computing, Inc. # Copyright 2012 OpenStack Foundation diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 5b0f5757b087..99364a8da754 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # Copyright 2010 OpenStack Foundation # diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py index e93c9e220c41..d3246341eadf 100644 --- a/nova/virt/xenapi/volume_utils.py +++ b/nova/virt/xenapi/volume_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # Copyright (c) 2013 OpenStack Foundation # diff --git a/nova/virt/xenapi/volumeops.py b/nova/virt/xenapi/volumeops.py index adea0c122fa5..38d9539406df 100644 --- a/nova/virt/xenapi/volumeops.py +++ b/nova/virt/xenapi/volumeops.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # Copyright (c) 2013 OpenStack Foundation # diff --git a/nova/vnc/__init__.py b/nova/vnc/__init__.py index af7257f6045e..006ee9479635 100644 --- a/nova/vnc/__init__.py +++ b/nova/vnc/__init__.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index 9b0adfe48954..75fc13573fd5 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py index 1a1917307337..a8a9510acdb2 100644 --- a/nova/volume/__init__.py +++ b/nova/volume/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index a9c8f81b2d13..3cf672737f5c 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/nova/volume/encryptors/__init__.py b/nova/volume/encryptors/__init__.py index 6f776357428d..79879d2a2359 100644 --- a/nova/volume/encryptors/__init__.py +++ b/nova/volume/encryptors/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/volume/encryptors/base.py b/nova/volume/encryptors/base.py index ac5331c8aa3b..113fefabdb59 100644 --- a/nova/volume/encryptors/base.py +++ b/nova/volume/encryptors/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/volume/encryptors/cryptsetup.py b/nova/volume/encryptors/cryptsetup.py index 5d9096fb18fb..d3c08a23d663 100644 --- a/nova/volume/encryptors/cryptsetup.py +++ b/nova/volume/encryptors/cryptsetup.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/volume/encryptors/luks.py b/nova/volume/encryptors/luks.py index 1ffbb1f1e162..0862247fab33 100644 --- a/nova/volume/encryptors/luks.py +++ b/nova/volume/encryptors/luks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/volume/encryptors/nop.py b/nova/volume/encryptors/nop.py index 6772585947a6..72066356c9f4 100644 --- a/nova/volume/encryptors/nop.py +++ b/nova/volume/encryptors/nop.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory # All Rights Reserved. # diff --git a/nova/wsgi.py b/nova/wsgi.py index f39efae9ba8d..c181c29c7215 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2010 OpenStack Foundation diff --git a/plugins/xenserver/networking/etc/xensource/scripts/novalib.py b/plugins/xenserver/networking/etc/xensource/scripts/novalib.py index 9189c601f116..4785b63d7163 100644 --- a/plugins/xenserver/networking/etc/xensource/scripts/novalib.py +++ b/plugins/xenserver/networking/etc/xensource/scripts/novalib.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py index 2a2cc213918b..53681f0e5162 100755 --- a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py +++ b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py index 2fa86237aec9..180feb78194f 100755 --- a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py +++ b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py index 2f1c2f4f5215..b13c624ec15b 100755 --- a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py +++ b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/tools/clean-vlans b/tools/clean-vlans index 284e5dc57636..8a0ebfc8d139 100755 --- a/tools/clean-vlans +++ b/tools/clean-vlans @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/tools/colorizer.py b/tools/colorizer.py index a49abb141763..c6a5ac8a1df2 100755 --- a/tools/colorizer.py +++ b/tools/colorizer.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013, Nebula, Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/tools/config/analyze_opts.py b/tools/config/analyze_opts.py index c91f4dedafec..8dd0fbf6e3a6 100755 --- a/tools/config/analyze_opts.py +++ b/tools/config/analyze_opts.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012, Cloudscaling # All Rights Reserved. # diff --git a/tools/db/schema_diff.py b/tools/db/schema_diff.py index 99afd3d20f79..fdcad3114ca7 100755 --- a/tools/db/schema_diff.py +++ b/tools/db/schema_diff.py @@ -1,7 +1,4 @@ #!/usr/bin/env python - -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/tools/esx/guest_tool.py b/tools/esx/guest_tool.py index 99cd62a64de0..4c830b05d41e 100644 --- a/tools/esx/guest_tool.py +++ b/tools/esx/guest_tool.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation # diff --git a/tools/install_venv.py b/tools/install_venv.py index 949b117d4b77..cf747d8ab830 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 1bab88a3fd3c..46822e32933e 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 IBM Corp. # diff --git a/tools/lintstack.py b/tools/lintstack.py index 0240a43dc0db..b2ff601350f5 100755 --- a/tools/lintstack.py +++ b/tools/lintstack.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012, AT&T Labs, Yun Mao # All Rights Reserved. # diff --git a/tools/regression_tester.py b/tools/regression_tester.py index 89a5a4dd2929..876184fdbd21 100755 --- a/tools/regression_tester.py +++ b/tools/regression_tester.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation # All Rights Reserved. #