From 5292e3380d205d99ed5c9b650de79069d20ad066 Mon Sep 17 00:00:00 2001 From: Albert Esteve Date: Thu, 1 Sep 2022 17:44:38 +0200 Subject: [PATCH] reuse: addheader *.py and *.am Use reuse addheader to modify and set a SPDX compliant header in all *.py and *.am files in the project. Signed-off-by: Albert Esteve --- Makefile.am | 21 +------ contrib/Makefile.am | 20 +----- contrib/nfs-check.py | 16 +---- doc/conf.py | 3 + helpers/Makefile.am | 8 +-- init/Makefile.am | 20 +----- init/systemd/Makefile.am | 20 +----- lib/Makefile.am | 20 +----- lib/dnf-plugins/Makefile.am | 20 +----- lib/dnf-plugins/vdsmupgrade.py | 19 +----- lib/vdsm/API.py | 21 +------ lib/vdsm/Makefile.am | 21 +------ lib/vdsm/__init__.py | 20 +----- lib/vdsm/alignmentScan.py | 22 +------ lib/vdsm/api/Makefile.am | 20 +----- lib/vdsm/api/__init__.py | 20 +----- .../api/schema_inconsistency_formatter.py | 21 +------ lib/vdsm/api/schema_to_html.py | 21 +------ lib/vdsm/api/schema_to_pickle.py | 21 +------ lib/vdsm/api/vdsmapi.py | 20 +----- lib/vdsm/client.py | 21 +------ lib/vdsm/clientIF.py | 20 +----- lib/vdsm/common/Makefile.am | 20 +----- lib/vdsm/common/__init__.py | 19 +----- lib/vdsm/common/api.py | 20 +----- lib/vdsm/common/base26.py | 19 +----- lib/vdsm/common/cache.py | 19 +----- lib/vdsm/common/cmdutils.py | 19 +----- lib/vdsm/common/commands.py | 20 +----- lib/vdsm/common/compat.py | 20 +----- lib/vdsm/common/concurrent.py | 20 +----- lib/vdsm/common/conv.py | 19 +----- lib/vdsm/common/cpuarch.py | 20 +----- lib/vdsm/common/define.py | 20 +----- lib/vdsm/common/errors.py | 20 +----- lib/vdsm/common/eventfd.py | 20 +----- lib/vdsm/common/exception.py | 20 +----- lib/vdsm/common/filecontrol.py | 20 +----- lib/vdsm/common/fileutils.py | 19 +----- lib/vdsm/common/function.py | 19 +----- lib/vdsm/common/glob.py | 59 +----------------- lib/vdsm/common/hooks.py | 20 +----- lib/vdsm/common/hostdev.py | 20 +----- lib/vdsm/common/hostutils.py | 19 +----- lib/vdsm/common/libvirtconnection.py | 20 +----- lib/vdsm/common/lockfile.py | 19 +----- lib/vdsm/common/logutils.py | 20 +----- lib/vdsm/common/marks.py | 19 +----- lib/vdsm/common/nbdutils.py | 19 +----- lib/vdsm/common/network/Makefile.am | 20 +----- lib/vdsm/common/network/__init__.py | 19 +----- lib/vdsm/common/network/address.py | 19 +----- lib/vdsm/common/osutils.py | 20 +----- lib/vdsm/common/panic.py | 19 +----- lib/vdsm/common/password.py | 20 +----- lib/vdsm/common/pki.py | 19 +----- lib/vdsm/common/proc.py | 19 +----- lib/vdsm/common/properties.py | 20 +----- lib/vdsm/common/pthread.py | 20 +----- lib/vdsm/common/response.py | 21 +------ lib/vdsm/common/sigutils.py | 20 +----- lib/vdsm/common/supervdsm.py | 21 +------ lib/vdsm/common/systemctl.py | 20 +----- lib/vdsm/common/systemd.py | 20 +----- lib/vdsm/common/threadlocal.py | 20 +----- lib/vdsm/common/time.py | 19 +----- lib/vdsm/common/udevadm.py | 20 +----- lib/vdsm/common/units.py | 8 +-- lib/vdsm/common/unixrpc.py | 19 +----- lib/vdsm/common/validate.py | 20 +----- lib/vdsm/common/xmlutils.py | 20 +----- lib/vdsm/config.py | 20 +----- lib/vdsm/constants.py | 20 +----- lib/vdsm/cpuinfo.py | 20 +----- lib/vdsm/dmidecodeUtil.py | 20 +----- lib/vdsm/executor.py | 20 +----- lib/vdsm/gluster/Makefile.am | 20 +----- lib/vdsm/gluster/__init__.py | 20 +----- lib/vdsm/gluster/api.py | 20 +----- lib/vdsm/gluster/apiwrapper.py | 20 +----- lib/vdsm/gluster/cli.py | 20 +----- lib/vdsm/gluster/events.py | 20 +----- lib/vdsm/gluster/exception.py | 20 +----- lib/vdsm/gluster/fence.py | 20 +----- lib/vdsm/gluster/fstab.py | 20 +----- lib/vdsm/gluster/gfapi.py | 20 +----- lib/vdsm/gluster/hooks.py | 20 +----- lib/vdsm/gluster/services.py | 20 +----- lib/vdsm/gluster/storagedev.py | 20 +----- lib/vdsm/gluster/tasks.py | 20 +----- lib/vdsm/gluster/thinstorage.py | 20 +----- lib/vdsm/health.py | 20 +----- lib/vdsm/hook/Makefile.am | 3 + lib/vdsm/hook/__init__.py | 19 +----- lib/vdsm/hook/hooking.py | 20 +----- lib/vdsm/host/Makefile.am | 20 +----- lib/vdsm/host/__init__.py | 20 +----- lib/vdsm/host/api.py | 20 +----- lib/vdsm/host/caps.py | 21 +------ lib/vdsm/host/rngsources.py | 20 +----- lib/vdsm/host/stats.py | 20 +----- lib/vdsm/hugepages.py | 20 +----- lib/vdsm/jobs.py | 19 +----- lib/vdsm/jsonrpcvdscli.py | 20 +----- lib/vdsm/kvm2ovirt.py | 19 +----- lib/vdsm/logUtils.py | 21 +------ lib/vdsm/machinetype.py | 20 +----- lib/vdsm/metrics/Makefile.am | 20 +----- lib/vdsm/metrics/__init__.py | 20 +----- lib/vdsm/metrics/hawkular.py | 20 +----- lib/vdsm/metrics/statsd.py | 20 +----- lib/vdsm/mkimage.py | 20 +----- lib/vdsm/moduleloader.py | 20 +----- lib/vdsm/momIF.py | 20 +----- lib/vdsm/network/Makefile.am | 19 +----- lib/vdsm/network/__init__.py | 19 +----- lib/vdsm/network/api.py | 19 +----- lib/vdsm/network/bond_monitor.py | 19 +----- lib/vdsm/network/canonicalize.py | 19 +----- lib/vdsm/network/cmd.py | 19 +----- lib/vdsm/network/common/Makefile.am | 19 +----- lib/vdsm/network/common/__init__.py | 19 +----- lib/vdsm/network/common/conversion_util.py | 19 +----- lib/vdsm/network/common/switch_util.py | 20 +----- lib/vdsm/network/configurators/Makefile.am | 19 +----- lib/vdsm/network/configurators/__init__.py | 19 +----- lib/vdsm/network/configurators/qos.py | 19 +----- lib/vdsm/network/connectivity.py | 19 +----- lib/vdsm/network/dhcp_monitor.py | 19 +----- lib/vdsm/network/dns.py | 20 +----- lib/vdsm/network/driverloader.py | 18 +----- lib/vdsm/network/errors.py | 20 +----- lib/vdsm/network/ethtool.py | 19 +----- lib/vdsm/network/initializer.py | 19 +----- lib/vdsm/network/ip/Makefile.am | 20 +----- lib/vdsm/network/ip/__init__.py | 19 +----- lib/vdsm/network/ip/address.py | 18 +----- lib/vdsm/network/ip/validator.py | 19 +----- lib/vdsm/network/ipwrapper.py | 19 +----- lib/vdsm/network/kernelconfig.py | 20 +----- lib/vdsm/network/link/Makefile.am | 20 +----- lib/vdsm/network/link/__init__.py | 19 +----- lib/vdsm/network/link/bond/Makefile.am | 20 +----- lib/vdsm/network/link/bond/__init__.py | 19 +----- lib/vdsm/network/link/bond/bond_speed.py | 19 +----- lib/vdsm/network/link/bond/sysfs_driver.py | 19 +----- lib/vdsm/network/link/bond/sysfs_options.py | 19 +----- .../network/link/bond/sysfs_options_mapper.py | 19 +----- lib/vdsm/network/link/bridge.py | 19 +----- lib/vdsm/network/link/iface.py | 19 +----- lib/vdsm/network/link/nic.py | 19 +----- lib/vdsm/network/link/setup.py | 19 +----- lib/vdsm/network/link/sriov.py | 19 +----- lib/vdsm/network/link/stats.py | 19 +----- lib/vdsm/network/link/validator.py | 19 +----- lib/vdsm/network/link/vlan.py | 19 +----- lib/vdsm/network/lldp/Makefile.am | 19 +----- lib/vdsm/network/lldp/__init__.py | 19 +----- lib/vdsm/network/lldp/info.py | 19 +----- lib/vdsm/network/lldp/lldpad.py | 19 +----- lib/vdsm/network/lldpad/Makefile.am | 19 +----- lib/vdsm/network/lldpad/__init__.py | 19 +----- lib/vdsm/network/lldpad/lldptool.py | 19 +----- lib/vdsm/network/netconfpersistence.py | 20 +----- lib/vdsm/network/netinfo/Makefile.am | 21 +------ lib/vdsm/network/netinfo/__init__.py | 21 +------ lib/vdsm/network/netinfo/addresses.py | 20 +----- lib/vdsm/network/netinfo/bonding.py | 20 +----- lib/vdsm/network/netinfo/bridges.py | 20 +----- lib/vdsm/network/netinfo/cache.py | 20 +----- lib/vdsm/network/netinfo/misc.py | 20 +----- lib/vdsm/network/netinfo/nics.py | 20 +----- lib/vdsm/network/netinfo/qos.py | 19 +----- lib/vdsm/network/netinfo/routes.py | 20 +----- lib/vdsm/network/netlink/Makefile.am | 20 +----- lib/vdsm/network/netlink/__init__.py | 20 +----- lib/vdsm/network/netlink/addr.py | 19 +----- lib/vdsm/network/netlink/libnl.py | 18 +----- lib/vdsm/network/netlink/link.py | 19 +----- lib/vdsm/network/netlink/monitor.py | 19 +----- lib/vdsm/network/netlink/route.py | 19 +----- lib/vdsm/network/netlink/waitfor.py | 20 +----- lib/vdsm/network/netstats.py | 19 +----- lib/vdsm/network/netswitch/Makefile.am | 20 +----- lib/vdsm/network/netswitch/__init__.py | 19 +----- lib/vdsm/network/netswitch/configurator.py | 19 +----- lib/vdsm/network/netswitch/validator.py | 19 +----- lib/vdsm/network/nmstate/Makefile.am | 19 +----- lib/vdsm/network/nmstate/__init__.py | 19 +----- lib/vdsm/network/nmstate/api.py | 19 +----- lib/vdsm/network/nmstate/bond.py | 19 +----- lib/vdsm/network/nmstate/bridge_util.py | 19 +----- lib/vdsm/network/nmstate/dns.py | 20 +----- lib/vdsm/network/nmstate/ip.py | 19 +----- lib/vdsm/network/nmstate/linux_bridge.py | 19 +----- lib/vdsm/network/nmstate/ovs/Makefile.am | 19 +----- lib/vdsm/network/nmstate/ovs/__init__.py | 19 +----- lib/vdsm/network/nmstate/ovs/info.py | 19 +----- lib/vdsm/network/nmstate/ovs/network.py | 19 +----- lib/vdsm/network/nmstate/route.py | 19 +----- lib/vdsm/network/nmstate/schema.py | 19 +----- lib/vdsm/network/nmstate/sriov.py | 19 +----- lib/vdsm/network/nmstate/state.py | 19 +----- lib/vdsm/network/ovn.py | 18 +----- lib/vdsm/network/restore_net_config.py | 19 +----- lib/vdsm/network/sysctl.py | 21 +------ lib/vdsm/network/tc/Makefile.am | 19 +----- lib/vdsm/network/tc/__init__.py | 20 +----- lib/vdsm/network/tc/_parser.py | 20 +----- lib/vdsm/network/tc/_wrapper.py | 19 +----- lib/vdsm/network/tc/cls.py | 19 +----- lib/vdsm/network/tc/filter.py | 19 +----- lib/vdsm/network/tc/qdisc.py | 19 +----- lib/vdsm/network/validator.py | 19 +----- lib/vdsm/numa.py | 20 +----- lib/vdsm/osinfo.py | 20 +----- lib/vdsm/ppc64HardwareInfo.py | 3 + lib/vdsm/profiling/Makefile.am | 21 +------ lib/vdsm/profiling/__init__.py | 20 +----- lib/vdsm/profiling/cpu.py | 20 +----- lib/vdsm/profiling/errors.py | 20 +----- lib/vdsm/profiling/memory.py | 20 +----- lib/vdsm/profiling/profile.py | 20 +----- lib/vdsm/protocoldetector.py | 20 +----- lib/vdsm/rpc/Bridge.py | 15 +---- lib/vdsm/rpc/Makefile.am | 3 + lib/vdsm/rpc/__init__.py | 19 +----- lib/vdsm/rpc/bindingjsonrpc.py | 16 +---- lib/vdsm/rpc/http.py | 20 +----- lib/vdsm/schedule.py | 20 +----- lib/vdsm/sslutils.py | 20 +----- lib/vdsm/storage/Makefile.am | 20 +----- lib/vdsm/storage/__init__.py | 19 +----- lib/vdsm/storage/asyncevent.py | 62 ++----------------- lib/vdsm/storage/asyncutils.py | 20 +----- lib/vdsm/storage/backends.py | 20 +----- lib/vdsm/storage/bitmaps.py | 20 +----- lib/vdsm/storage/blkdiscard.py | 20 +----- lib/vdsm/storage/blockSD.py | 20 +----- lib/vdsm/storage/blockVolume.py | 20 +----- lib/vdsm/storage/blockdev.py | 20 +----- lib/vdsm/storage/check.py | 20 +----- lib/vdsm/storage/clusterlock.py | 20 +----- lib/vdsm/storage/constants.py | 20 +----- lib/vdsm/storage/curlImgWrap.py | 20 +----- lib/vdsm/storage/devicemapper.py | 20 +----- lib/vdsm/storage/directio.py | 19 +----- lib/vdsm/storage/dispatcher.py | 20 +----- lib/vdsm/storage/dmsetup.py | 20 +----- lib/vdsm/storage/exception.py | 20 +----- lib/vdsm/storage/fallocate.py | 20 +----- lib/vdsm/storage/fileSD.py | 20 +----- lib/vdsm/storage/fileUtils.py | 20 +----- lib/vdsm/storage/fileVolume.py | 20 +----- lib/vdsm/storage/formatconverter.py | 20 +----- lib/vdsm/storage/fsutils.py | 20 +----- lib/vdsm/storage/fuser.py | 20 +----- lib/vdsm/storage/glance.py | 19 +----- lib/vdsm/storage/glusterSD.py | 20 +----- lib/vdsm/storage/glusterVolume.py | 20 +----- lib/vdsm/storage/guarded.py | 20 +----- lib/vdsm/storage/hba.py | 20 +----- lib/vdsm/storage/hsm.py | 20 +----- lib/vdsm/storage/image.py | 20 +----- lib/vdsm/storage/imageSharing.py | 19 +----- lib/vdsm/storage/imagetickets.py | 20 +----- lib/vdsm/storage/iscsi.py | 20 +----- lib/vdsm/storage/iscsiadm.py | 20 +----- lib/vdsm/storage/localFsSD.py | 20 +----- lib/vdsm/storage/lsof.py | 20 +----- lib/vdsm/storage/lvm.py | 21 +------ lib/vdsm/storage/lvmconf.py | 20 +----- lib/vdsm/storage/lvmdevices.py | 21 +------ lib/vdsm/storage/lvmfilter.py | 20 +----- lib/vdsm/storage/mailbox.py | 20 +----- lib/vdsm/storage/managedvolume.py | 20 +----- lib/vdsm/storage/managedvolumedb.py | 20 +----- lib/vdsm/storage/merge.py | 20 +----- lib/vdsm/storage/misc.py | 20 +----- lib/vdsm/storage/monitor.py | 20 +----- lib/vdsm/storage/mount.py | 20 +----- lib/vdsm/storage/mpathconf.py | 20 +----- lib/vdsm/storage/mpathhealth.py | 19 +----- lib/vdsm/storage/multipath.py | 20 +----- lib/vdsm/storage/nbd.py | 20 +----- lib/vdsm/storage/nfsSD.py | 20 +----- lib/vdsm/storage/nos_brick.py | 16 +---- lib/vdsm/storage/operation.py | 20 +----- lib/vdsm/storage/outOfProcess.py | 20 +----- lib/vdsm/storage/persistent.py | 20 +----- lib/vdsm/storage/protect/Makefile.am | 8 +-- lib/vdsm/storage/qemuimg.py | 20 +----- lib/vdsm/storage/resourceFactories.py | 20 +----- lib/vdsm/storage/resourceManager.py | 20 +----- lib/vdsm/storage/rwlock.py | 20 +----- lib/vdsm/storage/sanlock_direct.py | 20 +----- lib/vdsm/storage/sanlockconf.py | 19 +----- lib/vdsm/storage/sd.py | 20 +----- lib/vdsm/storage/sdc.py | 20 +----- lib/vdsm/storage/sdm/Makefile.am | 20 +----- lib/vdsm/storage/sdm/__init__.py | 20 +----- lib/vdsm/storage/sdm/api/Makefile.am | 20 +----- lib/vdsm/storage/sdm/api/__init__.py | 20 +----- lib/vdsm/storage/sdm/api/add_bitmap.py | 20 +----- lib/vdsm/storage/sdm/api/amend_volume.py | 21 +------ lib/vdsm/storage/sdm/api/base.py | 20 +----- lib/vdsm/storage/sdm/api/clear_bitmaps.py | 20 +----- lib/vdsm/storage/sdm/api/copy_data.py | 20 +----- lib/vdsm/storage/sdm/api/merge.py | 20 +----- lib/vdsm/storage/sdm/api/move_device.py | 20 +----- lib/vdsm/storage/sdm/api/reduce_domain.py | 20 +----- lib/vdsm/storage/sdm/api/remove_bitmap.py | 20 +----- lib/vdsm/storage/sdm/api/sparsify_volume.py | 20 +----- lib/vdsm/storage/sdm/api/update_volume.py | 21 +------ lib/vdsm/storage/sdm/volume_info.py | 20 +----- lib/vdsm/storage/securable.py | 20 +----- lib/vdsm/storage/sp.py | 20 +----- lib/vdsm/storage/spbackends.py | 20 +----- lib/vdsm/storage/spwd.py | 20 +----- lib/vdsm/storage/storageServer.py | 20 +----- lib/vdsm/storage/sysfs.py | 20 +----- lib/vdsm/storage/task.py | 20 +----- lib/vdsm/storage/taskManager.py | 20 +----- lib/vdsm/storage/threadPool.py | 3 + lib/vdsm/storage/transientdisk.py | 19 +----- lib/vdsm/storage/utils.py | 21 +------ lib/vdsm/storage/validators.py | 20 +----- lib/vdsm/storage/volume.py | 20 +----- lib/vdsm/storage/volumemetadata.py | 20 +----- lib/vdsm/storage/workarounds.py | 20 +----- lib/vdsm/storage/xlease.py | 20 +----- lib/vdsm/supervdsm_api/Makefile.am | 21 +------ lib/vdsm/supervdsm_api/__init__.py | 20 +----- lib/vdsm/supervdsm_api/devicemapper.py | 19 +----- lib/vdsm/supervdsm_api/dmsetup.py | 20 +----- lib/vdsm/supervdsm_api/hwinfo.py | 19 +----- lib/vdsm/supervdsm_api/ksm.py | 19 +----- lib/vdsm/supervdsm_api/lsof.py | 20 +----- lib/vdsm/supervdsm_api/managedvolume.py | 19 +----- lib/vdsm/supervdsm_api/mkimage.py | 19 +----- lib/vdsm/supervdsm_api/multipath.py | 19 +----- lib/vdsm/supervdsm_api/nbd.py | 19 +----- lib/vdsm/supervdsm_api/network.py | 19 +----- lib/vdsm/supervdsm_api/sanlock_direct.py | 20 +----- lib/vdsm/supervdsm_api/saslpasswd2.py | 19 +----- lib/vdsm/supervdsm_api/systemctl.py | 19 +----- lib/vdsm/supervdsm_api/test.py | 19 +----- lib/vdsm/supervdsm_api/udev.py | 19 +----- lib/vdsm/supervdsm_api/virt.py | 19 +----- lib/vdsm/supervdsm_server.py | 19 +----- lib/vdsm/taskset.py | 20 +----- lib/vdsm/throttledlog.py | 20 +----- lib/vdsm/tool/Makefile.am | 21 +------ lib/vdsm/tool/__init__.py | 19 +----- lib/vdsm/tool/check_volume_leases.py | 19 +----- lib/vdsm/tool/common.py | 19 +----- lib/vdsm/tool/config_lvm_filter.py | 19 +----- lib/vdsm/tool/configfile.py | 19 +----- lib/vdsm/tool/configurator.py | 19 +----- lib/vdsm/tool/configurators/Makefile.am | 21 +------ lib/vdsm/tool/configurators/__init__.py | 20 +----- lib/vdsm/tool/configurators/bond_defaults.py | 19 +----- lib/vdsm/tool/configurators/certificates.py | 19 +----- lib/vdsm/tool/configurators/libvirt.py | 19 +----- lib/vdsm/tool/configurators/lvm.py | 19 +----- .../tool/configurators/managedvolumedb.py | 20 +----- lib/vdsm/tool/configurators/multipath.py | 19 +----- lib/vdsm/tool/configurators/passwd.py | 19 +----- lib/vdsm/tool/configurators/sanlock.py | 19 +----- lib/vdsm/tool/configurators/sebool.py | 19 +----- lib/vdsm/tool/confmeta.py | 19 +----- lib/vdsm/tool/confutils.py | 19 +----- lib/vdsm/tool/dummybr.py | 19 +----- lib/vdsm/tool/dump_volume_chains.py | 19 +----- lib/vdsm/tool/network.py | 19 +----- lib/vdsm/tool/nwfilter.py | 20 +----- lib/vdsm/tool/register.py | 18 +----- lib/vdsm/tool/service.py | 19 +----- lib/vdsm/tool/transient.py | 19 +----- lib/vdsm/tool/upgrade.py | 19 +----- lib/vdsm/tool/vdsm-id.py | 19 +----- lib/vdsm/tool/vdsm_config.py | 19 +----- lib/vdsm/tool/xleases.py | 19 +----- lib/vdsm/utils.py | 20 +----- lib/vdsm/v2v.py | 20 +----- lib/vdsm/vdsmd.py | 9 +-- lib/vdsm/virt/Makefile.am | 19 +----- lib/vdsm/virt/__init__.py | 19 +----- lib/vdsm/virt/backup.py | 20 +----- lib/vdsm/virt/blockjob.py | 20 +----- lib/vdsm/virt/cpumanagement.py | 18 +----- lib/vdsm/virt/displaynetwork.py | 19 +----- lib/vdsm/virt/domain_descriptor.py | 20 +----- lib/vdsm/virt/domxml_preprocess.py | 20 +----- lib/vdsm/virt/errors.py | 20 +----- lib/vdsm/virt/events.py | 20 +----- lib/vdsm/virt/externaldata.py | 18 +----- lib/vdsm/virt/filedata.py | 18 +----- lib/vdsm/virt/guestagent.py | 20 +----- lib/vdsm/virt/guestagenthelpers.py | 20 +----- lib/vdsm/virt/jobs/Makefile.am | 20 +----- lib/vdsm/virt/jobs/__init__.py | 20 +----- lib/vdsm/virt/jobs/seal.py | 20 +----- lib/vdsm/virt/jobs/snapshot.py | 20 +----- lib/vdsm/virt/libvirthook/Makefile.am | 19 +----- lib/vdsm/virt/libvirthook/__init__.py | 2 + lib/vdsm/virt/libvirthook/vm_libvirt_hook.py | 19 +----- lib/vdsm/virt/libvirtnetwork.py | 19 +----- lib/vdsm/virt/libvirtxml.py | 20 +----- lib/vdsm/virt/livemerge.py | 20 +----- lib/vdsm/virt/metadata.py | 20 +----- lib/vdsm/virt/migration.py | 20 +----- lib/vdsm/virt/periodic.py | 20 +----- lib/vdsm/virt/qemuguestagent.py | 20 +----- lib/vdsm/virt/recovery.py | 20 +----- lib/vdsm/virt/sampling.py | 20 +----- lib/vdsm/virt/saslpasswd2.py | 19 +----- lib/vdsm/virt/secret.py | 20 +----- lib/vdsm/virt/thinp.py | 20 +----- lib/vdsm/virt/utils.py | 20 +----- lib/vdsm/virt/virdomain.py | 20 +----- lib/vdsm/virt/vm.py | 20 +----- lib/vdsm/virt/vmchannels.py | 20 +----- lib/vdsm/virt/vmdevices/Makefile.am | 21 +------ lib/vdsm/virt/vmdevices/__init__.py | 20 +----- lib/vdsm/virt/vmdevices/common.py | 20 +----- lib/vdsm/virt/vmdevices/compat.py | 20 +----- lib/vdsm/virt/vmdevices/core.py | 21 +------ lib/vdsm/virt/vmdevices/drivename.py | 19 +----- lib/vdsm/virt/vmdevices/graphics.py | 21 +------ lib/vdsm/virt/vmdevices/hostdevice.py | 21 +------ lib/vdsm/virt/vmdevices/hwclass.py | 20 +----- lib/vdsm/virt/vmdevices/lease.py | 21 +------ lib/vdsm/virt/vmdevices/lookup.py | 20 +----- lib/vdsm/virt/vmdevices/network.py | 21 +------ lib/vdsm/virt/vmdevices/storage.py | 21 +------ lib/vdsm/virt/vmdevices/storagexml.py | 19 +----- lib/vdsm/virt/vmexitreason.py | 20 +----- lib/vdsm/virt/vmpowerdown.py | 20 +----- lib/vdsm/virt/vmstats.py | 20 +----- lib/vdsm/virt/vmstatus.py | 20 +----- lib/vdsm/virt/vmtune.py | 20 +----- lib/vdsm/virt/vmxml.py | 20 +----- lib/vdsm/virt/xmlconstants.py | 20 +----- lib/vdsm/virtsparsify.py | 20 +----- lib/vdsm/virtsysprep.py | 20 +----- lib/vdsmclient/Makefile.am | 20 +----- lib/vdsmclient/__init__.py | 20 +----- lib/vdsmclient/client.py | 21 +------ lib/yajsonrpc/Makefile.am | 20 +----- lib/yajsonrpc/__init__.py | 18 ++---- lib/yajsonrpc/betterAsyncore.py | 15 +---- lib/yajsonrpc/exception.py | 16 +---- lib/yajsonrpc/jsonrpcclient.py | 16 +---- lib/yajsonrpc/stomp.py | 17 +---- lib/yajsonrpc/stompclient.py | 16 +---- lib/yajsonrpc/stompserver.py | 15 +---- static/Makefile.am | 20 +----- static/libexec/vdsm/sitecustomize.py | 3 + tests/API_test.py | 20 +----- tests/Makefile.am | 20 +----- tests/alignmentscan_test.py | 22 +------ tests/apiData.py | 20 +----- tests/api_response_test.py | 20 +----- tests/better_asyncore_test.py | 21 +------ tests/caps_test.py | 22 +------ tests/check_imports.py | 20 +----- tests/clientif_test.py | 20 +----- tests/cmdutils_test.py | 20 +----- tests/common/__init__.py | 20 +----- tests/common/cache_test.py | 20 +----- tests/common/cmdutils_test.py | 20 +----- tests/common/commands_test.py | 20 +----- tests/common/concurrent_test.py | 20 +----- tests/common/fileutils_test.py | 20 +----- tests/common/function_test.py | 20 +----- tests/common/hostutils_test.py | 20 +----- tests/common/libvirtconnection_test.py | 21 +------ tests/common/logutils_test.py | 20 +----- tests/common/network_test.py | 19 +----- tests/common/osutils_test.py | 20 +----- tests/common/proc_test.py | 20 +----- tests/common/properties_test.py | 20 +----- tests/common/pthread_test.py | 20 +----- tests/common/systemctl_test.py | 20 +----- tests/common/systemd_test.py | 20 +----- tests/common/time_test.py | 20 +----- tests/common/validate_test.py | 21 +------ tests/config_test.py | 19 +----- tests/conftest.py | 20 +----- tests/cpu_profile_test.py | 20 +----- tests/cpuinfo_test.py | 21 +------ tests/devices/__init__.py | 20 +----- tests/devices/parsing/__init__.py | 20 +----- tests/devices/parsing/complex_vm_test.py | 3 + tests/domcaps_test.py | 23 +------ tests/eventfd_test.py | 20 +----- tests/exception_test.py | 20 +----- tests/executor_test.py | 20 +----- tests/fakelib.py | 20 +----- tests/fakemetadatalib.py | 20 +----- tests/filecontrol_test.py | 20 +----- tests/functional/__init__.py | 20 +----- tests/functional/momTests.py | 20 +----- tests/functional/supervdsmFuncTests.py | 19 +----- tests/functional/upgrade_vdsm_test.py | 20 +----- tests/functional/utils.py | 19 +----- tests/fuser_test.py | 20 +----- tests/glob_test.py | 62 ++----------------- tests/gluster/__init__.py | 20 +----- tests/gluster/cli_test.py | 22 +------ tests/gluster/hooks_test.py | 22 +------ tests/glusterTestData.py | 20 +----- tests/gluster_cli_test.py | 20 +----- tests/gluster_exception_test.py | 20 +----- tests/gluster_thinstorage_test.py | 20 +----- tests/hooking_test.py | 22 +------ tests/hooks/vhostmd_test.py | 19 +----- tests/hostdev_test.py | 20 +----- tests/hostdevlib.py | 20 +----- tests/hoststats_test.py | 20 +----- tests/hugepages_test.py | 21 +------ tests/hwinfo_test.py | 20 +----- tests/integration/__init__.py | 20 +----- tests/integration/jsonRpcHelper.py | 20 +----- tests/integration/sslhelper.py | 3 + tests/jobs_test.py | 19 +----- tests/jsonRpcClient_test.py | 20 +----- tests/jsonrpc_test.py | 20 +----- tests/kvm2ovirt_test.py | 19 +----- tests/lib/bridge_test.py | 21 +------ tests/lib/hooks_test.py | 20 +----- tests/lib/osinfo_test.py | 20 +----- tests/lib/protocoldetector_test.py | 20 +----- tests/lib/rpc/http_detector_test.py | 20 +----- .../rpc/http_image_request_handler_test.py | 20 +----- tests/lib/utils_test.py | 20 +----- tests/lib/yajsonrpc/encoding_test.py | 20 +----- tests/lib/yajsonrpc/frame_test.py | 20 +----- tests/lib/yajsonrpc/jsonrpcserver_test.py | 20 +----- tests/lib/yajsonrpc/parser_test.py | 20 +----- tests/lib/yajsonrpc/stomp_detector_test.py | 20 +----- tests/lib/yajsonrpc/stomp_test.py | 20 +----- .../yajsonrpc/stompasyncdispatcher_test.py | 20 +----- tests/lib/yajsonrpc/stomprpcclient_test.py | 20 +----- tests/mkimage_test.py | 21 +------ tests/modprobe.py | 20 +----- tests/moduleloader_test.py | 20 +----- tests/mom_policy_validator.py | 3 + tests/mom_test.py | 20 +----- tests/mompolicy_test.py | 3 + tests/monkeypatch.py | 20 +----- tests/monkeypatch_test.py | 20 +----- tests/network/__init__.py | 20 +----- tests/network/conftest.py | 18 +----- tests/network/dhcp.py | 19 +----- tests/network/firewall.py | 19 +----- tests/network/functional/__init__.py | 20 +----- tests/network/functional/bond_basic_test.py | 20 +----- tests/network/functional/bridge_test.py | 20 +----- tests/network/functional/conftest.py | 20 +----- tests/network/functional/dns_test.py | 20 +----- tests/network/functional/dynamic_ip_test.py | 20 +----- tests/network/functional/hook_test.py | 20 +----- tests/network/functional/link_mtu_test.py | 20 +----- tests/network/functional/net_basic_test.py | 20 +----- tests/network/functional/net_qos_test.py | 19 +----- .../network/functional/net_with_bond_test.py | 19 +----- tests/network/functional/netfunctestlib.py | 20 +----- tests/network/functional/netrestore_test.py | 18 +----- tests/network/functional/rollback_test.py | 20 +----- tests/network/functional/static_ip_test.py | 20 +----- tests/network/functional/stats_test.py | 20 +----- .../functional/switch_type_change_test.py | 20 +----- tests/network/integration/__init__.py | 20 +----- tests/network/integration/cmd_test.py | 20 +----- tests/network/integration/conftest.py | 18 +----- .../network/integration/dhcp_monitor_test.py | 19 +----- tests/network/integration/dns_test.py | 19 +----- tests/network/integration/ethtool_test.py | 20 +----- tests/network/integration/iperf.py | 20 +----- tests/network/integration/ipwrapper_test.py | 20 +----- tests/network/integration/link_bond_test.py | 19 +----- tests/network/integration/link_bridge_test.py | 19 +----- tests/network/integration/link_iface_test.py | 19 +----- tests/network/integration/link_stats_test.py | 20 +----- tests/network/integration/lldpad_test.py | 20 +----- tests/network/integration/netinfo_test.py | 21 +------ tests/network/integration/netintegtestlib.py | 20 +----- tests/network/integration/netlink_test.py | 20 +----- tests/network/integration/tc_test.py | 20 +----- tests/network/nettestlib.py | 19 +----- tests/network/static/config.py | 21 +------ tests/network/static/constants.py | 20 +----- tests/network/static/dsaversion.py | 21 +------ tests/network/unit/__init__.py | 20 +----- tests/network/unit/canonicalize_test.py | 20 +----- tests/network/unit/conf_persistence_test.py | 20 +----- tests/network/unit/config_network_test.py | 21 +------ tests/network/unit/connectivity_test.py | 21 +------ tests/network/unit/dns_test.py | 19 +----- tests/network/unit/driverloader_test.py | 18 +----- tests/network/unit/ip_address_test.py | 19 +----- tests/network/unit/ip_validator_test.py | 19 +----- tests/network/unit/ipwrapper_test.py | 20 +----- tests/network/unit/link_setup_test.py | 19 +----- tests/network/unit/link_validator_test.py | 19 +----- tests/network/unit/lldpad_test.py | 20 +----- tests/network/unit/netinfo_test.py | 21 +------ tests/network/unit/netswitch_test.py | 19 +----- .../network/unit/netswitch_validator_test.py | 19 +----- tests/network/unit/nmstate/__init__.py | 20 +----- tests/network/unit/nmstate/bond_test.py | 20 +----- tests/network/unit/nmstate/conftest.py | 18 +----- .../network/unit/nmstate/linux_bridge_test.py | 20 +----- tests/network/unit/nmstate/ovs_bridge_test.py | 20 +----- .../network/unit/nmstate/source_route_test.py | 18 +----- tests/network/unit/nmstate/sriov_test.py | 20 +----- tests/network/unit/nmstate/testlib.py | 20 +----- tests/network/unit/nmstate/vlan_test.py | 20 +----- tests/network/unit/qos_test.py | 19 +----- tests/network/unit/sriov_test.py | 19 +----- tests/network/unit/tc_test.py | 20 +----- tests/network/unit/testlib.py | 20 +----- tests/osutils_test.py | 20 +----- tests/panic_helper.py | 3 + tests/passwords_test.py | 20 +----- tests/permutation_test.py | 20 +----- tests/prlimit_test.py | 20 +----- tests/pywatch_test.py | 21 +------ tests/response_test.py | 20 +----- tests/rngsources_test.py | 20 +----- tests/schedule_test.py | 20 +----- tests/schemavalidation_test.py | 20 +----- tests/sigutils_test.py | 20 +----- tests/ssl_test.py | 20 +----- tests/statsd_test.py | 21 +------ tests/stomp_test_utils.py | 20 +----- tests/stompadapter_test.py | 20 +----- tests/stompasyncclient_test.py | 20 +----- tests/storage/__init__.py | 21 +------ tests/storage/asyncevent_test.py | 20 +----- tests/storage/asyncutils_test.py | 20 +----- tests/storage/backends_test.py | 20 +----- tests/storage/bitmaps_test.py | 19 +----- tests/storage/blkdiscard_test.py | 20 +----- tests/storage/blockdev_test.py | 20 +----- tests/storage/blocksd_test.py | 21 +------ tests/storage/blockvolume_test.py | 20 +----- tests/storage/check_test.py | 20 +----- tests/storage/cleanup.py | 20 +----- tests/storage/clusterlock_test.py | 20 +----- tests/storage/conftest.py | 20 +----- tests/storage/constants.py | 20 +----- tests/storage/curlimgwrap_test.py | 20 +----- tests/storage/devicemapper_test.py | 20 +----- tests/storage/directio_test.py | 20 +----- tests/storage/dmsetup_test.py | 20 +----- tests/storage/exception_test.py | 20 +----- .../fake_os_brick/os_brick/__init__.py | 2 + .../os_brick/initiator/__init__.py | 2 + .../os_brick/initiator/connector.py | 20 +----- tests/storage/fakelib_test.py | 19 +----- tests/storage/fakesanlock.py | 20 +----- tests/storage/fakesanlock_test.py | 20 +----- tests/storage/fallocate_test.py | 20 +----- tests/storage/filesd_metadata_test.py | 20 +----- tests/storage/filesd_test.py | 20 +----- tests/storage/fileutil_test.py | 20 +----- tests/storage/filevolume_test.py | 20 +----- tests/storage/formatconverter_test.py | 20 +----- tests/storage/glance_test.py | 20 +----- tests/storage/glustervolume_test.py | 20 +----- tests/storage/guarded_test.py | 20 +----- tests/storage/hsm_connect_test.py | 20 +----- tests/storage/hsm_test.py | 20 +----- tests/storage/image_test.py | 20 +----- tests/storage/imagetickets_test.py | 20 +----- tests/storage/iscsi_test.py | 20 +----- tests/storage/iscsiadm_test.py | 19 +----- tests/storage/localfssd_test.py | 21 +------ tests/storage/loopback.py | 21 +------ tests/storage/loopback_test.py | 20 +----- tests/storage/lsof_test.py | 20 +----- tests/storage/lvm_test.py | 21 +------ tests/storage/lvmconf_test.py | 21 +------ tests/storage/lvmfilter_test.py | 21 +------ tests/storage/mailbox_test.py | 20 +----- tests/storage/managedvolume_test.py | 20 +----- tests/storage/managedvolumedb_test.py | 20 +----- tests/storage/marks.py | 21 +------ tests/storage/merge_test.py | 20 +----- tests/storage/misc_test.py | 20 +----- tests/storage/monitor_test.py | 20 +----- tests/storage/mount_test.py | 20 +----- tests/storage/mpathconf_test.py | 22 +------ tests/storage/mpathhealth_monitor_test.py | 20 +----- tests/storage/multipath_test.py | 20 +----- tests/storage/nbd_test.py | 21 +------ tests/storage/nbdutils_test.py | 19 +----- tests/storage/nfssd_test.py | 21 +------ tests/storage/operation_test.py | 20 +----- tests/storage/outofprocess_test.py | 20 +----- tests/storage/persistent_test.py | 20 +----- tests/storage/qemuimg_test.py | 20 +----- tests/storage/qemuio.py | 19 +----- tests/storage/qemuio_test.py | 19 +----- tests/storage/resourcemanager_test.py | 20 +----- tests/storage/rwlock_test.py | 20 +----- tests/storage/sanlock_direct_test.py | 20 +----- tests/storage/sanlockconf_test.py | 20 +----- tests/storage/sd_manifest_test.py | 19 +----- tests/storage/sd_test.py | 20 +----- tests/storage/sdm_add_bitmap_test.py | 21 +------ tests/storage/sdm_amend_volume_test.py | 20 +----- tests/storage/sdm_clear_bitmaps_test.py | 21 +------ tests/storage/sdm_copy_data_test.py | 20 +----- tests/storage/sdm_indirection_test.py | 19 +----- tests/storage/sdm_merge_test.py | 20 +----- tests/storage/sdm_remove_bitmap_test.py | 21 +------ tests/storage/sdm_update_volume_test.py | 20 +----- tests/storage/securable_test.py | 20 +----- tests/storage/spwd_test.py | 20 +----- tests/storage/storagefakelib.py | 19 +----- tests/storage/storageserver_nfs_test.py | 20 +----- tests/storage/storageserver_test.py | 20 +----- tests/storage/storagetestlib.py | 19 +----- tests/storage/stress/download.py | 3 + tests/storage/stress/extend.py | 3 + tests/storage/stress/initiator.py | 4 ++ tests/storage/stress/release-spm-lease.py | 3 + tests/storage/stress/reload.py | 4 ++ tests/storage/stress/switch_master.py | 3 + tests/storage/stress/thinp.py | 3 + tests/storage/sysfs_test.py | 20 +----- tests/storage/task_test.py | 20 +----- tests/storage/taskmanager_test.py | 20 +----- tests/storage/testlib_test.py | 19 +----- tests/storage/threadpool_test.py | 20 +----- tests/storage/tmpfs.py | 20 +----- tests/storage/tmprepo.py | 19 +----- tests/storage/tmpstorage.py | 20 +----- tests/storage/transientdisk_test.py | 19 +----- tests/storage/userstorage.py | 8 +-- tests/storage/volume_metadata_test.py | 19 +----- tests/storage/volume_test.py | 20 +----- tests/storage/workarounds_test.py | 20 +----- tests/storage/xlease_test.py | 20 +----- tests/sysprep_test.py | 20 +----- tests/taskset_test.py | 20 +----- tests/testValidation.py | 20 +----- tests/testing.py | 21 +------ tests/testlib.py | 20 +----- tests/testlib_test.py | 20 +----- tests/testrunner.py | 20 +----- tests/tests_child.py | 19 +----- tests/throttledlog_test.py | 20 +----- tests/tool_confmeta_test.py | 19 +----- tests/tool_test.py | 20 +----- tests/unixrpc_testlib.py | 19 +----- tests/v2v_testlib.py | 19 +----- tests/validate_test.py | 20 +----- tests/vdsmapi_test.py | 20 +----- tests/vdsmdumpchains_test.py | 20 +----- tests/verify.py | 20 +----- tests/virt/__init__.py | 20 +----- tests/virt/backup_test.py | 20 +----- tests/virt/boot_hostdev_test.py | 21 +------ tests/virt/bulk_sampling_test.py | 20 +----- tests/virt/cd_test.py | 21 +------ tests/virt/cpumanagement_test.py | 18 +----- tests/virt/device_compat_test.py | 22 +------ tests/virt/device_lookup_test.py | 21 +------ tests/virt/device_test.py | 20 +----- tests/virt/devicexml_test.py | 21 +------ tests/virt/diskreplicate_test.py | 20 +----- tests/virt/displaynetwork_test.py | 20 +----- tests/virt/domaindescriptor_test.py | 21 +------ tests/virt/domxml_preprocess_test.py | 21 +------ tests/virt/drivename_test.py | 20 +----- tests/virt/events_test.py | 22 +------ tests/virt/externaldata_test.py | 18 +----- tests/virt/fakedomainadapter.py | 20 +----- tests/virt/filedata_test.py | 17 +---- tests/virt/guestagent_test.py | 21 +------ tests/virt/guestagenthelpers_test.py | 20 +----- tests/virt/libvirtnetwork_test.py | 20 +----- tests/virt/livemerge_test.py | 21 +------ tests/virt/metadata_storage_test.py | 20 +----- tests/virt/metadata_test.py | 20 +----- tests/virt/periodic_test.py | 20 +----- tests/virt/powerdown_test.py | 21 +------ tests/virt/prepared_test.py | 20 +----- tests/virt/qemuguestagent_test.py | 20 +----- tests/virt/sampling_test.py | 20 +----- tests/virt/seal_job_test.py | 19 +----- tests/virt/thinp_monitor_test.py | 20 +----- tests/virt/thinp_test.py | 21 +------ tests/virt/transient_test.py | 19 +----- tests/virt/utils_test.py | 21 +------ tests/virt/v2v_test.py | 19 +----- tests/virt/virdomain_test.py | 22 +------ tests/virt/vm_create_test.py | 21 +------ tests/virt/vm_libvirt_hook_test.py | 19 +----- tests/virt/vm_test.py | 22 +------ tests/virt/vmfakelib.py | 22 +------ tests/virt/vmfakelib_test.py | 20 +----- tests/virt/vmlease_test.py | 20 +----- tests/virt/vmmigration_test.py | 20 +----- tests/virt/vmoperations_test.py | 22 +------ tests/virt/vmrecovery_test.py | 20 +----- tests/virt/vmsecret_test.py | 20 +----- tests/virt/vmstats_test.py | 20 +----- tests/virt/vmstorage_test.py | 20 +----- tests/virt/vmutils_test.py | 20 +----- tests/virt/vmxml_test.py | 21 +------ tests/vmTestsData.py | 20 +----- tests/vmapi_test.py | 20 +----- tests/vmfakecon.py | 20 +----- vdsm_hooks/Makefile.am | 20 +----- vdsm_hooks/allocate_net/Makefile.am | 20 +----- .../allocate_net/before_device_create.py | 21 +------ vdsm_hooks/boot_hostdev/Makefile.am | 20 +----- vdsm_hooks/boot_hostdev/before_vm_start.py | 21 +------ vdsm_hooks/checkimages/Makefile.am | 20 +----- vdsm_hooks/checkimages/before_vm_start.py | 3 + vdsm_hooks/checkips/Makefile.am | 21 +------ vdsm_hooks/checkips/after_get_stats.py | 22 ++----- vdsm_hooks/checkips/checkips_utils.py | 21 +------ vdsm_hooks/cpuflags/Makefile.am | 20 +----- vdsm_hooks/cpuflags/before_vm_start.py | 21 +------ vdsm_hooks/diskunmap/Makefile.am | 22 +------ vdsm_hooks/diskunmap/before_vm_start.py | 21 +------ vdsm_hooks/ethtool_options/Makefile.am | 20 +----- vdsm_hooks/ethtool_options/ethtool_options.py | 20 +----- vdsm_hooks/extnet/Makefile.am | 20 +----- vdsm_hooks/extnet/extnet_vnic.py | 4 ++ vdsm_hooks/extra_ipv4_addrs/Makefile.am | 20 +----- .../extra_ipv4_addrs/extra_ipv4_addrs.py | 20 +----- vdsm_hooks/fakevmstats/Makefile.am | 20 +----- .../fakevmstats/after_get_all_vm_stats.py | 21 +------ vdsm_hooks/faqemu/Makefile.am | 20 +----- vdsm_hooks/faqemu/after_get_caps.py | 21 +------ vdsm_hooks/faqemu/before_vm_start.py | 21 +------ vdsm_hooks/fcoe/Makefile.am | 20 +----- vdsm_hooks/fcoe/fcoe_before_network_setup.py | 3 + vdsm_hooks/fileinject/Makefile.am | 20 +----- vdsm_hooks/fileinject/before_vm_start.py | 3 + vdsm_hooks/httpsisoboot/Makefile.am | 20 +----- vdsm_hooks/httpsisoboot/before_vm_start.py | 3 + vdsm_hooks/localdisk/Makefile.am | 21 +------ vdsm_hooks/log_console/Makefile.am | 20 +----- vdsm_hooks/log_console/before_vm_start.py | 21 +------ vdsm_hooks/log_firmware/Makefile.am | 20 +----- vdsm_hooks/log_firmware/before_vm_start.py | 21 +------ vdsm_hooks/macbind/Makefile.am | 22 +------ vdsm_hooks/macbind/before_vm_start.py | 21 +------ vdsm_hooks/nestedvt/Makefile.am | 20 +----- vdsm_hooks/nestedvt/before_vm_start.py | 22 ++----- vdsm_hooks/openstacknet/Makefile.am | 20 +----- .../openstacknet/after_device_create.py | 3 + vdsm_hooks/openstacknet/after_get_caps.py | 21 +------ vdsm_hooks/openstacknet/after_vm_start.py | 3 + .../openstacknet/before_device_create.py | 3 + vdsm_hooks/openstacknet/openstacknet_utils.py | 3 + vdsm_hooks/qemucmdline/Makefile.am | 21 +------ vdsm_hooks/qemucmdline/before_vm_start.py | 22 ++----- vdsm_hooks/scratchpad/Makefile.am | 20 +----- vdsm_hooks/scratchpad/after_vm_destroy.py | 3 + .../scratchpad/before_vm_migrate_source.py | 3 + vdsm_hooks/scratchpad/before_vm_start.py | 3 + vdsm_hooks/smbios/Makefile.am | 20 +----- vdsm_hooks/smbios/before_vm_start.py | 3 + vdsm_hooks/spiceoptions/Makefile.am | 22 +------ vdsm_hooks/spiceoptions/before_vm_start.py | 3 + vdsm_hooks/vhostmd/Makefile.am | 20 +----- vdsm_hooks/vhostmd/after_vm_destroy.py | 22 ++----- vdsm_hooks/vhostmd/before_vm_start.py | 21 +------ vdsm_hooks/vmfex_dev/Makefile.am | 20 +----- vdsm_hooks/vmfex_dev/vmfex_vnic.py | 21 +------ 880 files changed, 1898 insertions(+), 15028 deletions(-) diff --git a/Makefile.am b/Makefile.am index aa4f9a3c4d..94f66758a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2008-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + TOX_MIN_VERSION = 3.15 # We don't want the standard gnu file setup (README, INSTALL, etc.) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index bb10a23e56..8ee6223154 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2008-2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/contrib/nfs-check.py b/contrib/nfs-check.py index 21e15cacac..e6a408016a 100644 --- a/contrib/nfs-check.py +++ b/contrib/nfs-check.py @@ -1,18 +1,6 @@ # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import print_function from __future__ import absolute_import diff --git a/doc/conf.py b/doc/conf.py index 5a856d8c4c..40ee062ddb 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + # -*- coding: utf-8 -*- # # VDSM documentation build configuration file, created by diff --git a/helpers/Makefile.am b/helpers/Makefile.am index 1f570ce506..187f5d1cea 100644 --- a/helpers/Makefile.am +++ b/helpers/Makefile.am @@ -1,10 +1,6 @@ # Copyright 2016 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/init/Makefile.am b/init/Makefile.am index fdaef1e094..343e8e566b 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -1,23 +1,7 @@ -# # Copyright 2013 IBM, Inc. # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later SUBDIRS = systemd diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am index 05f32efddc..d87291c9e9 100644 --- a/init/systemd/Makefile.am +++ b/init/systemd/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2008-2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/Makefile.am b/lib/Makefile.am index 77ddf8467d..6e52104345 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2013-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/dnf-plugins/Makefile.am b/lib/dnf-plugins/Makefile.am index 689484e95a..e1204ebe20 100644 --- a/lib/dnf-plugins/Makefile.am +++ b/lib/dnf-plugins/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later dnfpluginsdir = $(pythondir)/dnf-plugins diff --git a/lib/dnf-plugins/vdsmupgrade.py b/lib/dnf-plugins/vdsmupgrade.py index a671f77e39..1c13887487 100644 --- a/lib/dnf-plugins/vdsmupgrade.py +++ b/lib/dnf-plugins/vdsmupgrade.py @@ -1,21 +1,6 @@ -# # Copyright 2018-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/API.py b/lib/vdsm/API.py index fa76a1f45e..8c6cea8894 100644 --- a/lib/vdsm/API.py +++ b/lib/vdsm/API.py @@ -1,24 +1,7 @@ -# # Copyright (C) 2012 Adam Litke, IBM Corporation # Copyright (C) 2012-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# pylint: disable=R0904 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 65865720f8..b116993df8 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2013-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs SUBDIRS=api common tool profiling rpc network virt storage hook host metrics \ diff --git a/lib/vdsm/__init__.py b/lib/vdsm/__init__.py index 84d567cbbf..c75d17b766 100644 --- a/lib/vdsm/__init__.py +++ b/lib/vdsm/__init__.py @@ -1,21 +1,5 @@ -# # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/alignmentScan.py b/lib/vdsm/alignmentScan.py index 925bea63f4..f9825bd0ab 100644 --- a/lib/vdsm/alignmentScan.py +++ b/lib/vdsm/alignmentScan.py @@ -1,23 +1,7 @@ -# -# Copyright (c) 2012-2017 Red Hat, Inc. # Copyright (c) 2012 Sasha Tomic -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# Copyright (c) 2012-2017 Red Hat, Inc. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/api/Makefile.am b/lib/vdsm/api/Makefile.am index cb7f1043b9..19db23566a 100644 --- a/lib/vdsm/api/Makefile.am +++ b/lib/vdsm/api/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmapidir = $(vdsmpylibdir)/api diff --git a/lib/vdsm/api/__init__.py b/lib/vdsm/api/__init__.py index 6656c2acab..4157c626e9 100644 --- a/lib/vdsm/api/__init__.py +++ b/lib/vdsm/api/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/api/schema_inconsistency_formatter.py b/lib/vdsm/api/schema_inconsistency_formatter.py index 4170150f86..b937135e11 100644 --- a/lib/vdsm/api/schema_inconsistency_formatter.py +++ b/lib/vdsm/api/schema_inconsistency_formatter.py @@ -1,22 +1,7 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/api/schema_to_html.py b/lib/vdsm/api/schema_to_html.py index 11b9d3d733..67fd549a41 100755 --- a/lib/vdsm/api/schema_to_html.py +++ b/lib/vdsm/api/schema_to_html.py @@ -1,24 +1,9 @@ #!/usr/bin/python3 -# + # Copyright (C) 2012-2016 Adam Litke, IBM Corporation # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/api/schema_to_pickle.py b/lib/vdsm/api/schema_to_pickle.py index 1a9ca73bbd..312d7fd772 100755 --- a/lib/vdsm/api/schema_to_pickle.py +++ b/lib/vdsm/api/schema_to_pickle.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/api/vdsmapi.py b/lib/vdsm/api/vdsmapi.py index d37117d4a6..9030edb16b 100755 --- a/lib/vdsm/api/vdsmapi.py +++ b/lib/vdsm/api/vdsmapi.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/client.py b/lib/vdsm/client.py index b6916931c7..d826bed8a7 100644 --- a/lib/vdsm/client.py +++ b/lib/vdsm/client.py @@ -1,22 +1,7 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ vdsm client diff --git a/lib/vdsm/clientIF.py b/lib/vdsm/clientIF.py index 0930102fd1..881646a384 100644 --- a/lib/vdsm/clientIF.py +++ b/lib/vdsm/clientIF.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/common/Makefile.am b/lib/vdsm/common/Makefile.am index 05c721a299..5c40f2fdaa 100644 --- a/lib/vdsm/common/Makefile.am +++ b/lib/vdsm/common/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs SUBDIRS = network diff --git a/lib/vdsm/common/__init__.py b/lib/vdsm/common/__init__.py index 2d2c3cfc0b..e92bed6f1f 100644 --- a/lib/vdsm/common/__init__.py +++ b/lib/vdsm/common/__init__.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/api.py b/lib/vdsm/common/api.py index 47a990794d..1c26dff86c 100644 --- a/lib/vdsm/common/api.py +++ b/lib/vdsm/common/api.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/base26.py b/lib/vdsm/common/base26.py index 3b2d73891e..1f257219ec 100644 --- a/lib/vdsm/common/base26.py +++ b/lib/vdsm/common/base26.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/cache.py b/lib/vdsm/common/cache.py index 943fa09eab..275a42a19d 100644 --- a/lib/vdsm/common/cache.py +++ b/lib/vdsm/common/cache.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/cmdutils.py b/lib/vdsm/common/cmdutils.py index ea9dc87755..edfc04e92d 100644 --- a/lib/vdsm/common/cmdutils.py +++ b/lib/vdsm/common/cmdutils.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/commands.py b/lib/vdsm/common/commands.py index 22cb19aced..a4d952b870 100644 --- a/lib/vdsm/common/commands.py +++ b/lib/vdsm/common/commands.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/compat.py b/lib/vdsm/common/compat.py index e3c11edbb9..a604a82b12 100644 --- a/lib/vdsm/common/compat.py +++ b/lib/vdsm/common/compat.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/concurrent.py b/lib/vdsm/common/concurrent.py index d9af4914b8..b48ec8e856 100644 --- a/lib/vdsm/common/concurrent.py +++ b/lib/vdsm/common/concurrent.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/conv.py b/lib/vdsm/common/conv.py index e5316da982..7ded020f61 100644 --- a/lib/vdsm/common/conv.py +++ b/lib/vdsm/common/conv.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/cpuarch.py b/lib/vdsm/common/cpuarch.py index 4fd499d309..6c591ea4ea 100644 --- a/lib/vdsm/common/cpuarch.py +++ b/lib/vdsm/common/cpuarch.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/define.py b/lib/vdsm/common/define.py index fb283ba027..da0b25eb26 100644 --- a/lib/vdsm/common/define.py +++ b/lib/vdsm/common/define.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/errors.py b/lib/vdsm/common/errors.py index 238dcc6175..ebb1428deb 100644 --- a/lib/vdsm/common/errors.py +++ b/lib/vdsm/common/errors.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ errors - vdsm internal errors diff --git a/lib/vdsm/common/eventfd.py b/lib/vdsm/common/eventfd.py index 48499d3828..ddd97d542b 100644 --- a/lib/vdsm/common/eventfd.py +++ b/lib/vdsm/common/eventfd.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/exception.py b/lib/vdsm/common/exception.py index 3a8fd5f1ab..f6bb604898 100644 --- a/lib/vdsm/common/exception.py +++ b/lib/vdsm/common/exception.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/filecontrol.py b/lib/vdsm/common/filecontrol.py index 6745fc8c99..66d4917439 100644 --- a/lib/vdsm/common/filecontrol.py +++ b/lib/vdsm/common/filecontrol.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/fileutils.py b/lib/vdsm/common/fileutils.py index b7bfb5619d..d40e3cc2c6 100644 --- a/lib/vdsm/common/fileutils.py +++ b/lib/vdsm/common/fileutils.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/function.py b/lib/vdsm/common/function.py index 482dd84e01..ee802112e5 100644 --- a/lib/vdsm/common/function.py +++ b/lib/vdsm/common/function.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/glob.py b/lib/vdsm/common/glob.py index 9b68e87b21..809ba6779d 100644 --- a/lib/vdsm/common/glob.py +++ b/lib/vdsm/common/glob.py @@ -1,60 +1,7 @@ -# +# Copyright (c) 2001, # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -# 2010, 2011, 2012, 2013, 2014, 2015 Python Software Foundation; All -# Rights Reserved -# -# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2; you -# may not use this file except in compliance with the License. -# -# PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -# -------------------------------------------- -# -# 1. This LICENSE AGREEMENT is between the Python Software Foundation -# ("PSF"), and the Individual or Organization ("Licensee") accessing and -# otherwise using this software ("Python") in source or binary form and -# its associated documentation. -# -# 2. Subject to the terms and conditions of this License Agreement, PSF -# hereby grants Licensee a nonexclusive, royalty-free, world-wide -# license to reproduce, analyze, test, perform and/or display publicly, -# prepare derivative works, distribute, and otherwise use Python alone -# or in any derivative version, provided, however, that PSF's License -# Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, -# 2013, 2014, 2015 Python Software Foundation; All Rights Reserved" are -# retained in Python alone or in any derivative version prepared by -# Licensee. -# -# 3. In the event Licensee prepares a derivative work that is based on -# or incorporates Python or any part thereof, and wants to make the -# derivative work available to others as provided herein, then Licensee -# hereby agrees to include in any such work a brief summary of the -# changes made to Python. -# -# 4. PSF is making Python available to Licensee on an "AS IS" basis. -# PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY -# WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY -# REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY -# PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY -# THIRD PARTY RIGHTS. -# -# 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -# FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A -# RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY -# DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. -# -# 6. This License Agreement will automatically terminate upon a material -# breach of its terms and conditions. -# -# 7. Nothing in this License Agreement shall be deemed to create any -# relationship of agency, partnership, or joint venture between PSF and -# Licensee. This License Agreement does not grant permission to use PSF -# trademarks or trade name in a trademark sense to endorse or promote -# products or services of Licensee, or any third party. -# -# 8. By copying, installing or otherwise using Python, Licensee agrees -# to be bound by the terms and conditions of this License Agreement. -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/hooks.py b/lib/vdsm/common/hooks.py index ca8e454c3d..f32576c363 100644 --- a/lib/vdsm/common/hooks.py +++ b/lib/vdsm/common/hooks.py @@ -1,22 +1,6 @@ -# # Copyright 2010-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import print_function from __future__ import absolute_import diff --git a/lib/vdsm/common/hostdev.py b/lib/vdsm/common/hostdev.py index e1f1ecc3a7..dff2e277a2 100644 --- a/lib/vdsm/common/hostdev.py +++ b/lib/vdsm/common/hostdev.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/hostutils.py b/lib/vdsm/common/hostutils.py index 62f1365caf..ed96e6844c 100644 --- a/lib/vdsm/common/hostutils.py +++ b/lib/vdsm/common/hostutils.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/libvirtconnection.py b/lib/vdsm/common/libvirtconnection.py index 3c964f0d5c..a946cec4fe 100644 --- a/lib/vdsm/common/libvirtconnection.py +++ b/lib/vdsm/common/libvirtconnection.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/lockfile.py b/lib/vdsm/common/lockfile.py index 3b8a55c01d..0f4192e944 100644 --- a/lib/vdsm/common/lockfile.py +++ b/lib/vdsm/common/lockfile.py @@ -1,21 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/logutils.py b/lib/vdsm/common/logutils.py index 0afb851cbe..328579c424 100644 --- a/lib/vdsm/common/logutils.py +++ b/lib/vdsm/common/logutils.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/marks.py b/lib/vdsm/common/marks.py index 8bf7d4c2b7..9590dba7de 100644 --- a/lib/vdsm/common/marks.py +++ b/lib/vdsm/common/marks.py @@ -1,21 +1,6 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/nbdutils.py b/lib/vdsm/common/nbdutils.py index 337fc64f45..6fac5d3fc0 100644 --- a/lib/vdsm/common/nbdutils.py +++ b/lib/vdsm/common/nbdutils.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/network/Makefile.am b/lib/vdsm/common/network/Makefile.am index 42291c1ae1..2561f9d7cb 100644 --- a/lib/vdsm/common/network/Makefile.am +++ b/lib/vdsm/common/network/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmcommonnetworkdir = $(vdsmpylibdir)/common/network diff --git a/lib/vdsm/common/network/__init__.py b/lib/vdsm/common/network/__init__.py index 2d2c3cfc0b..e92bed6f1f 100644 --- a/lib/vdsm/common/network/__init__.py +++ b/lib/vdsm/common/network/__init__.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/network/address.py b/lib/vdsm/common/network/address.py index 73b8ca767a..91e6e872f4 100644 --- a/lib/vdsm/common/network/address.py +++ b/lib/vdsm/common/network/address.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/osutils.py b/lib/vdsm/common/osutils.py index 34e74c403c..56d0745ce4 100644 --- a/lib/vdsm/common/osutils.py +++ b/lib/vdsm/common/osutils.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/panic.py b/lib/vdsm/common/panic.py index 3e607a1ef2..5b553afb84 100644 --- a/lib/vdsm/common/panic.py +++ b/lib/vdsm/common/panic.py @@ -1,21 +1,6 @@ -# # Copyright 2015-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import os diff --git a/lib/vdsm/common/password.py b/lib/vdsm/common/password.py index 6d0ba354f1..b8e23eeedc 100644 --- a/lib/vdsm/common/password.py +++ b/lib/vdsm/common/password.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/pki.py b/lib/vdsm/common/pki.py index b8f33ae9b3..df587e68bc 100644 --- a/lib/vdsm/common/pki.py +++ b/lib/vdsm/common/pki.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/proc.py b/lib/vdsm/common/proc.py index d48332e433..9b10262a67 100644 --- a/lib/vdsm/common/proc.py +++ b/lib/vdsm/common/proc.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/properties.py b/lib/vdsm/common/properties.py index e36adc26ae..f069f0f835 100644 --- a/lib/vdsm/common/properties.py +++ b/lib/vdsm/common/properties.py @@ -1,22 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ properties - reusable properties diff --git a/lib/vdsm/common/pthread.py b/lib/vdsm/common/pthread.py index d66a82adae..02405f3599 100644 --- a/lib/vdsm/common/pthread.py +++ b/lib/vdsm/common/pthread.py @@ -1,22 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/response.py b/lib/vdsm/common/response.py index e9599b1588..2b07fdacd2 100644 --- a/lib/vdsm/common/response.py +++ b/lib/vdsm/common/response.py @@ -1,23 +1,6 @@ -# # Copyright 2008-2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/sigutils.py b/lib/vdsm/common/sigutils.py index 119140e266..36480a8d2d 100644 --- a/lib/vdsm/common/sigutils.py +++ b/lib/vdsm/common/sigutils.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/supervdsm.py b/lib/vdsm/common/supervdsm.py index 53734c07a6..735d7947f1 100644 --- a/lib/vdsm/common/supervdsm.py +++ b/lib/vdsm/common/supervdsm.py @@ -1,23 +1,6 @@ -# # Copyright 2011-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/systemctl.py b/lib/vdsm/common/systemctl.py index 8c8dd76d0a..65b9020ef9 100644 --- a/lib/vdsm/common/systemctl.py +++ b/lib/vdsm/common/systemctl.py @@ -1,21 +1,7 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ systemctl - wrapper for systemctl command. """ diff --git a/lib/vdsm/common/systemd.py b/lib/vdsm/common/systemd.py index 41f00579dc..898f5b2126 100644 --- a/lib/vdsm/common/systemd.py +++ b/lib/vdsm/common/systemd.py @@ -1,21 +1,7 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ systemd - wrapper for systemd-run command. """ diff --git a/lib/vdsm/common/threadlocal.py b/lib/vdsm/common/threadlocal.py index 8410a0f5e5..cea389e601 100644 --- a/lib/vdsm/common/threadlocal.py +++ b/lib/vdsm/common/threadlocal.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/time.py b/lib/vdsm/common/time.py index 774bcc0b4e..0875413be9 100644 --- a/lib/vdsm/common/time.py +++ b/lib/vdsm/common/time.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/udevadm.py b/lib/vdsm/common/udevadm.py index d50de84c29..0fc14480b7 100644 --- a/lib/vdsm/common/udevadm.py +++ b/lib/vdsm/common/udevadm.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/units.py b/lib/vdsm/common/units.py index 166bff5d54..c45b698d58 100644 --- a/lib/vdsm/common/units.py +++ b/lib/vdsm/common/units.py @@ -1,9 +1,7 @@ # Copyright (C) 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Constants for file/disk sizes. """ diff --git a/lib/vdsm/common/unixrpc.py b/lib/vdsm/common/unixrpc.py index a0573ebbe6..742275383d 100644 --- a/lib/vdsm/common/unixrpc.py +++ b/lib/vdsm/common/unixrpc.py @@ -1,21 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/validate.py b/lib/vdsm/common/validate.py index 813a7e141a..8e0589c25f 100644 --- a/lib/vdsm/common/validate.py +++ b/lib/vdsm/common/validate.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/xmlutils.py b/lib/vdsm/common/xmlutils.py index f83452bc8f..95c9116331 100644 --- a/lib/vdsm/common/xmlutils.py +++ b/lib/vdsm/common/xmlutils.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/config.py b/lib/vdsm/config.py index 53428675fe..afa408d048 100644 --- a/lib/vdsm/config.py +++ b/lib/vdsm/config.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/constants.py b/lib/vdsm/constants.py index 081755f6be..be75b8a726 100644 --- a/lib/vdsm/constants.py +++ b/lib/vdsm/constants.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/cpuinfo.py b/lib/vdsm/cpuinfo.py index b24d9061bf..e55146e05c 100644 --- a/lib/vdsm/cpuinfo.py +++ b/lib/vdsm/cpuinfo.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/dmidecodeUtil.py b/lib/vdsm/dmidecodeUtil.py index 33e252e1d6..71867f6c3c 100644 --- a/lib/vdsm/dmidecodeUtil.py +++ b/lib/vdsm/dmidecodeUtil.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/executor.py b/lib/vdsm/executor.py index 124e639196..7278a83800 100644 --- a/lib/vdsm/executor.py +++ b/lib/vdsm/executor.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import """Threaded based executor. diff --git a/lib/vdsm/gluster/Makefile.am b/lib/vdsm/gluster/Makefile.am index 6cae22b6ab..fcff61c954 100644 --- a/lib/vdsm/gluster/Makefile.am +++ b/lib/vdsm/gluster/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/gluster/__init__.py b/lib/vdsm/gluster/__init__.py index a0a60e3099..59b98e47cb 100644 --- a/lib/vdsm/gluster/__init__.py +++ b/lib/vdsm/gluster/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/api.py b/lib/vdsm/gluster/api.py index fa9962eb87..84ba1bcd86 100644 --- a/lib/vdsm/gluster/api.py +++ b/lib/vdsm/gluster/api.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/apiwrapper.py b/lib/vdsm/gluster/apiwrapper.py index 9bb5af5f1c..cf4920b5d4 100644 --- a/lib/vdsm/gluster/apiwrapper.py +++ b/lib/vdsm/gluster/apiwrapper.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/cli.py b/lib/vdsm/gluster/cli.py index 7c8e954ab8..d77f462037 100644 --- a/lib/vdsm/gluster/cli.py +++ b/lib/vdsm/gluster/cli.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/events.py b/lib/vdsm/gluster/events.py index 06452f8fde..2871ac9124 100644 --- a/lib/vdsm/gluster/events.py +++ b/lib/vdsm/gluster/events.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/exception.py b/lib/vdsm/gluster/exception.py index f575b54136..e52f050828 100644 --- a/lib/vdsm/gluster/exception.py +++ b/lib/vdsm/gluster/exception.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later ######################################################## # diff --git a/lib/vdsm/gluster/fence.py b/lib/vdsm/gluster/fence.py index ea88cd344c..c86e59b7db 100644 --- a/lib/vdsm/gluster/fence.py +++ b/lib/vdsm/gluster/fence.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/fstab.py b/lib/vdsm/gluster/fstab.py index 570927cfbb..3a88ca5435 100644 --- a/lib/vdsm/gluster/fstab.py +++ b/lib/vdsm/gluster/fstab.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/gfapi.py b/lib/vdsm/gluster/gfapi.py index 8a665b7ba8..f084450804 100644 --- a/lib/vdsm/gluster/gfapi.py +++ b/lib/vdsm/gluster/gfapi.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/hooks.py b/lib/vdsm/gluster/hooks.py index 592f27493b..e94dff2e89 100644 --- a/lib/vdsm/gluster/hooks.py +++ b/lib/vdsm/gluster/hooks.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/services.py b/lib/vdsm/gluster/services.py index 8da56fb3d0..471d2d2709 100644 --- a/lib/vdsm/gluster/services.py +++ b/lib/vdsm/gluster/services.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/storagedev.py b/lib/vdsm/gluster/storagedev.py index 0949929a09..0138c7dca9 100644 --- a/lib/vdsm/gluster/storagedev.py +++ b/lib/vdsm/gluster/storagedev.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/tasks.py b/lib/vdsm/gluster/tasks.py index 62950d9056..77ef91d784 100644 --- a/lib/vdsm/gluster/tasks.py +++ b/lib/vdsm/gluster/tasks.py @@ -1,22 +1,6 @@ -# # Copyright 2013-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/gluster/thinstorage.py b/lib/vdsm/gluster/thinstorage.py index ecce32dc64..cfeca8e7d2 100644 --- a/lib/vdsm/gluster/thinstorage.py +++ b/lib/vdsm/gluster/thinstorage.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/health.py b/lib/vdsm/health.py index f593eeeeb6..00aa51b312 100644 --- a/lib/vdsm/health.py +++ b/lib/vdsm/health.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/hook/Makefile.am b/lib/vdsm/hook/Makefile.am index dec5bbb9aa..25b18d4290 100644 --- a/lib/vdsm/hook/Makefile.am +++ b/lib/vdsm/hook/Makefile.am @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + vdsmhookdir = $(vdsmpylibdir)/hook dist_vdsmhook_PYTHON = \ diff --git a/lib/vdsm/hook/__init__.py b/lib/vdsm/hook/__init__.py index f9cbe73142..4157c626e9 100644 --- a/lib/vdsm/hook/__init__.py +++ b/lib/vdsm/hook/__init__.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/hook/hooking.py b/lib/vdsm/hook/hooking.py index 4af8e68da9..ce3a0a86b5 100644 --- a/lib/vdsm/hook/hooking.py +++ b/lib/vdsm/hook/hooking.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ hooking - various stuff useful when writing vdsm hooks diff --git a/lib/vdsm/host/Makefile.am b/lib/vdsm/host/Makefile.am index 3243217863..fe91a7313a 100644 --- a/lib/vdsm/host/Makefile.am +++ b/lib/vdsm/host/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmhostdir = $(vdsmpylibdir)/host diff --git a/lib/vdsm/host/__init__.py b/lib/vdsm/host/__init__.py index 9d529d7e2e..27651cff6b 100644 --- a/lib/vdsm/host/__init__.py +++ b/lib/vdsm/host/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/host/api.py b/lib/vdsm/host/api.py index e9a85040a8..3b0c6a3f87 100644 --- a/lib/vdsm/host/api.py +++ b/lib/vdsm/host/api.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/host/caps.py b/lib/vdsm/host/caps.py index 4eb2b2bd2e..7b4c0bfdc7 100644 --- a/lib/vdsm/host/caps.py +++ b/lib/vdsm/host/caps.py @@ -1,22 +1,7 @@ -# # Copyright 2011-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """Collect host capabilities""" from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/host/rngsources.py b/lib/vdsm/host/rngsources.py index fbf6e7efdc..15e697f823 100644 --- a/lib/vdsm/host/rngsources.py +++ b/lib/vdsm/host/rngsources.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/host/stats.py b/lib/vdsm/host/stats.py index 3fafe5bd88..2cd23bd588 100644 --- a/lib/vdsm/host/stats.py +++ b/lib/vdsm/host/stats.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/hugepages.py b/lib/vdsm/hugepages.py index 009ac529aa..619070778f 100644 --- a/lib/vdsm/hugepages.py +++ b/lib/vdsm/hugepages.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/jobs.py b/lib/vdsm/jobs.py index 1979ffbadb..e1f3cd0fe8 100644 --- a/lib/vdsm/jobs.py +++ b/lib/vdsm/jobs.py @@ -1,21 +1,6 @@ # Copyright 2015-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py index 13b4ec323c..d4bdcea7c7 100644 --- a/lib/vdsm/jsonrpcvdscli.py +++ b/lib/vdsm/jsonrpcvdscli.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/kvm2ovirt.py b/lib/vdsm/kvm2ovirt.py index 2554368cae..fa411fd1f7 100644 --- a/lib/vdsm/kvm2ovirt.py +++ b/lib/vdsm/kvm2ovirt.py @@ -1,21 +1,6 @@ # Copyright 2016-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/logUtils.py b/lib/vdsm/logUtils.py index 31d47188a7..18ba713d3e 100644 --- a/lib/vdsm/logUtils.py +++ b/lib/vdsm/logUtils.py @@ -1,22 +1,7 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ This module is left behind as a proxy to the relocated logutils module. The two proxy functions have been referenced in logger.conf, therefore, diff --git a/lib/vdsm/machinetype.py b/lib/vdsm/machinetype.py index b5adfb6eba..c71847a0d4 100644 --- a/lib/vdsm/machinetype.py +++ b/lib/vdsm/machinetype.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/metrics/Makefile.am b/lib/vdsm/metrics/Makefile.am index 65a02ae0ad..8682a982ba 100644 --- a/lib/vdsm/metrics/Makefile.am +++ b/lib/vdsm/metrics/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmmetricsdir = $(vdsmpylibdir)/metrics diff --git a/lib/vdsm/metrics/__init__.py b/lib/vdsm/metrics/__init__.py index c9b63a78f9..adff77ed0a 100644 --- a/lib/vdsm/metrics/__init__.py +++ b/lib/vdsm/metrics/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/metrics/hawkular.py b/lib/vdsm/metrics/hawkular.py index cb2f681953..74fa20d4e6 100644 --- a/lib/vdsm/metrics/hawkular.py +++ b/lib/vdsm/metrics/hawkular.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/metrics/statsd.py b/lib/vdsm/metrics/statsd.py index df9bfbe10d..3c17d0cebd 100644 --- a/lib/vdsm/metrics/statsd.py +++ b/lib/vdsm/metrics/statsd.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/mkimage.py b/lib/vdsm/mkimage.py index 40a15b6196..af716e392b 100644 --- a/lib/vdsm/mkimage.py +++ b/lib/vdsm/mkimage.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/moduleloader.py b/lib/vdsm/moduleloader.py index ce12769042..228139c248 100644 --- a/lib/vdsm/moduleloader.py +++ b/lib/vdsm/moduleloader.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import import importlib diff --git a/lib/vdsm/momIF.py b/lib/vdsm/momIF.py index 0c3f805e15..15cfc4efd5 100644 --- a/lib/vdsm/momIF.py +++ b/lib/vdsm/momIF.py @@ -1,22 +1,6 @@ -# # Copyright (C) 2012, IBM Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am index f8eeb85044..b83fc61e9f 100644 --- a/lib/vdsm/network/Makefile.am +++ b/lib/vdsm/network/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later SUBDIRS = common configurators ip link lldp lldpad netinfo netlink nmstate tc netswitch diff --git a/lib/vdsm/network/__init__.py b/lib/vdsm/network/__init__.py index 8d6e73bb6a..26c6ed5a02 100644 --- a/lib/vdsm/network/__init__.py +++ b/lib/vdsm/network/__init__.py @@ -1,21 +1,6 @@ # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py index b03a40174f..657f934263 100644 --- a/lib/vdsm/network/api.py +++ b/lib/vdsm/network/api.py @@ -1,21 +1,6 @@ # Copyright 2011-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/bond_monitor.py b/lib/vdsm/network/bond_monitor.py index 0042ac3adf..bff9cd53bb 100644 --- a/lib/vdsm/network/bond_monitor.py +++ b/lib/vdsm/network/bond_monitor.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import threading diff --git a/lib/vdsm/network/canonicalize.py b/lib/vdsm/network/canonicalize.py index 699451c122..83a90a627e 100644 --- a/lib/vdsm/network/canonicalize.py +++ b/lib/vdsm/network/canonicalize.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/cmd.py b/lib/vdsm/network/cmd.py index f5838d9d0f..93033d1faf 100644 --- a/lib/vdsm/network/cmd.py +++ b/lib/vdsm/network/cmd.py @@ -1,21 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/common/Makefile.am b/lib/vdsm/network/common/Makefile.am index fecf21c932..09fa87d399 100644 --- a/lib/vdsm/network/common/Makefile.am +++ b/lib/vdsm/network/common/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/common/__init__.py b/lib/vdsm/network/common/__init__.py index 7fcaeb54f7..f023af1c03 100644 --- a/lib/vdsm/network/common/__init__.py +++ b/lib/vdsm/network/common/__init__.py @@ -1,18 +1,3 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file diff --git a/lib/vdsm/network/common/conversion_util.py b/lib/vdsm/network/common/conversion_util.py index 34513d32ad..385b4fe90e 100644 --- a/lib/vdsm/network/common/conversion_util.py +++ b/lib/vdsm/network/common/conversion_util.py @@ -1,21 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later def to_str(value): """Convert textual value to native string. diff --git a/lib/vdsm/network/common/switch_util.py b/lib/vdsm/network/common/switch_util.py index c1c40ae67c..ec35c9f6fd 100644 --- a/lib/vdsm/network/common/switch_util.py +++ b/lib/vdsm/network/common/switch_util.py @@ -1,22 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later class SwitchType(object): LINUX_BRIDGE = 'legacy' diff --git a/lib/vdsm/network/configurators/Makefile.am b/lib/vdsm/network/configurators/Makefile.am index 6f39ffeb49..9f33eb0d99 100644 --- a/lib/vdsm/network/configurators/Makefile.am +++ b/lib/vdsm/network/configurators/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2013-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/configurators/__init__.py b/lib/vdsm/network/configurators/__init__.py index 3612a211bc..352ff9604b 100644 --- a/lib/vdsm/network/configurators/__init__.py +++ b/lib/vdsm/network/configurators/__init__.py @@ -1,21 +1,6 @@ # Copyright 2013-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from . import qos diff --git a/lib/vdsm/network/configurators/qos.py b/lib/vdsm/network/configurators/qos.py index 1b51af9852..95ba327df8 100644 --- a/lib/vdsm/network/configurators/qos.py +++ b/lib/vdsm/network/configurators/qos.py @@ -1,21 +1,6 @@ # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/connectivity.py b/lib/vdsm/network/connectivity.py index d622be4137..8c76ad3ed8 100644 --- a/lib/vdsm/network/connectivity.py +++ b/lib/vdsm/network/connectivity.py @@ -1,21 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/dhcp_monitor.py b/lib/vdsm/network/dhcp_monitor.py index 8e7266c611..faa73d11ca 100644 --- a/lib/vdsm/network/dhcp_monitor.py +++ b/lib/vdsm/network/dhcp_monitor.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from contextlib import contextmanager import logging diff --git a/lib/vdsm/network/dns.py b/lib/vdsm/network/dns.py index 251692e63e..5a72334cb2 100644 --- a/lib/vdsm/network/dns.py +++ b/lib/vdsm/network/dns.py @@ -1,21 +1,7 @@ -# # Copyright 2015-2020 Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/driverloader.py b/lib/vdsm/network/driverloader.py index 8b54532fba..02d9d06b1e 100644 --- a/lib/vdsm/network/driverloader.py +++ b/lib/vdsm/network/driverloader.py @@ -1,20 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/errors.py b/lib/vdsm/network/errors.py index d717effdaa..319da66c56 100644 --- a/lib/vdsm/network/errors.py +++ b/lib/vdsm/network/errors.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/ethtool.py b/lib/vdsm/network/ethtool.py index 30eacf5010..6b7759bccb 100644 --- a/lib/vdsm/network/ethtool.py +++ b/lib/vdsm/network/ethtool.py @@ -1,21 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/initializer.py b/lib/vdsm/network/initializer.py index 005c07e42a..6955eec540 100644 --- a/lib/vdsm/network/initializer.py +++ b/lib/vdsm/network/initializer.py @@ -1,21 +1,6 @@ # Copyright 2017-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/ip/Makefile.am b/lib/vdsm/network/ip/Makefile.am index 19c3099089..3716a1d4c9 100644 --- a/lib/vdsm/network/ip/Makefile.am +++ b/lib/vdsm/network/ip/Makefile.am @@ -1,22 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/ip/__init__.py b/lib/vdsm/network/ip/__init__.py index 2d2c3cfc0b..e92bed6f1f 100644 --- a/lib/vdsm/network/ip/__init__.py +++ b/lib/vdsm/network/ip/__init__.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/ip/address.py b/lib/vdsm/network/ip/address.py index c7d87a5c44..0fd7bac523 100644 --- a/lib/vdsm/network/ip/address.py +++ b/lib/vdsm/network/ip/address.py @@ -1,20 +1,6 @@ # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import ipaddress import logging diff --git a/lib/vdsm/network/ip/validator.py b/lib/vdsm/network/ip/validator.py index bd948c5b58..5134dc727b 100644 --- a/lib/vdsm/network/ip/validator.py +++ b/lib/vdsm/network/ip/validator.py @@ -1,21 +1,6 @@ # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/ipwrapper.py b/lib/vdsm/network/ipwrapper.py index efb6f701dd..8dfbc6d1d2 100644 --- a/lib/vdsm/network/ipwrapper.py +++ b/lib/vdsm/network/ipwrapper.py @@ -1,21 +1,6 @@ # Copyright 2013-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/kernelconfig.py b/lib/vdsm/network/kernelconfig.py index f9d280dafe..cc014cde7f 100644 --- a/lib/vdsm/network/kernelconfig.py +++ b/lib/vdsm/network/kernelconfig.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/Makefile.am b/lib/vdsm/network/link/Makefile.am index caebc73dd2..08a52b2219 100644 --- a/lib/vdsm/network/link/Makefile.am +++ b/lib/vdsm/network/link/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + SUBDIRS = bond include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/link/__init__.py b/lib/vdsm/network/link/__init__.py index 2d2c3cfc0b..e92bed6f1f 100644 --- a/lib/vdsm/network/link/__init__.py +++ b/lib/vdsm/network/link/__init__.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/bond/Makefile.am b/lib/vdsm/network/link/bond/Makefile.am index 96d48d0305..7fed98ce5a 100644 --- a/lib/vdsm/network/link/bond/Makefile.am +++ b/lib/vdsm/network/link/bond/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmnetworklinkbonddir = $(vdsmpylibdir)/network/link/bond diff --git a/lib/vdsm/network/link/bond/__init__.py b/lib/vdsm/network/link/bond/__init__.py index 5ba8a2bd86..23d3df8c8d 100644 --- a/lib/vdsm/network/link/bond/__init__.py +++ b/lib/vdsm/network/link/bond/__init__.py @@ -1,21 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/bond/bond_speed.py b/lib/vdsm/network/link/bond/bond_speed.py index da0ef7890f..e6784b2e2b 100644 --- a/lib/vdsm/network/link/bond/bond_speed.py +++ b/lib/vdsm/network/link/bond/bond_speed.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/bond/sysfs_driver.py b/lib/vdsm/network/link/bond/sysfs_driver.py index 1d77fba2a5..c58a32723b 100644 --- a/lib/vdsm/network/link/bond/sysfs_driver.py +++ b/lib/vdsm/network/link/bond/sysfs_driver.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/bond/sysfs_options.py b/lib/vdsm/network/link/bond/sysfs_options.py index 91e0533156..6ad2b48ca2 100644 --- a/lib/vdsm/network/link/bond/sysfs_options.py +++ b/lib/vdsm/network/link/bond/sysfs_options.py @@ -1,21 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/bond/sysfs_options_mapper.py b/lib/vdsm/network/link/bond/sysfs_options_mapper.py index 4050d44547..bf0b9b1652 100644 --- a/lib/vdsm/network/link/bond/sysfs_options_mapper.py +++ b/lib/vdsm/network/link/bond/sysfs_options_mapper.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/bridge.py b/lib/vdsm/network/link/bridge.py index cbcdb2413c..91992fbe9c 100644 --- a/lib/vdsm/network/link/bridge.py +++ b/lib/vdsm/network/link/bridge.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import glob import os diff --git a/lib/vdsm/network/link/iface.py b/lib/vdsm/network/link/iface.py index e769bc1d97..50d98a4b37 100644 --- a/lib/vdsm/network/link/iface.py +++ b/lib/vdsm/network/link/iface.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/nic.py b/lib/vdsm/network/link/nic.py index 5bbaf27777..8b953a6914 100644 --- a/lib/vdsm/network/link/nic.py +++ b/lib/vdsm/network/link/nic.py @@ -1,21 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/setup.py b/lib/vdsm/network/link/setup.py index 91eba93809..dcf4939489 100644 --- a/lib/vdsm/network/link/setup.py +++ b/lib/vdsm/network/link/setup.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/sriov.py b/lib/vdsm/network/link/sriov.py index 501696e60a..cb8fd88b85 100644 --- a/lib/vdsm/network/link/sriov.py +++ b/lib/vdsm/network/link/sriov.py @@ -1,21 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/stats.py b/lib/vdsm/network/link/stats.py index b3f289315e..79bf4050bc 100644 --- a/lib/vdsm/network/link/stats.py +++ b/lib/vdsm/network/link/stats.py @@ -1,21 +1,6 @@ # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/validator.py b/lib/vdsm/network/link/validator.py index 3e70e46014..27847b2a87 100644 --- a/lib/vdsm/network/link/validator.py +++ b/lib/vdsm/network/link/validator.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/link/vlan.py b/lib/vdsm/network/link/vlan.py index 7143433d57..84cfe0943e 100644 --- a/lib/vdsm/network/link/vlan.py +++ b/lib/vdsm/network/link/vlan.py @@ -1,21 +1,6 @@ # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/lldp/Makefile.am b/lib/vdsm/network/lldp/Makefile.am index 3fdfebc2b4..d20c3894c8 100644 --- a/lib/vdsm/network/lldp/Makefile.am +++ b/lib/vdsm/network/lldp/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/lldp/__init__.py b/lib/vdsm/network/lldp/__init__.py index a6565a2487..3ace2e171d 100644 --- a/lib/vdsm/network/lldp/__init__.py +++ b/lib/vdsm/network/lldp/__init__.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/lldp/info.py b/lib/vdsm/network/lldp/info.py index 6d245c94bb..a2279fab43 100644 --- a/lib/vdsm/network/lldp/info.py +++ b/lib/vdsm/network/lldp/info.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/lldp/lldpad.py b/lib/vdsm/network/lldp/lldpad.py index 437a529cb5..7f8874c751 100644 --- a/lib/vdsm/network/lldp/lldpad.py +++ b/lib/vdsm/network/lldp/lldpad.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/lldpad/Makefile.am b/lib/vdsm/network/lldpad/Makefile.am index 7085b354de..564e23ec61 100644 --- a/lib/vdsm/network/lldpad/Makefile.am +++ b/lib/vdsm/network/lldpad/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/lldpad/__init__.py b/lib/vdsm/network/lldpad/__init__.py index f9cbe73142..4157c626e9 100644 --- a/lib/vdsm/network/lldpad/__init__.py +++ b/lib/vdsm/network/lldpad/__init__.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/lldpad/lldptool.py b/lib/vdsm/network/lldpad/lldptool.py index 27e01fddd0..ea765f4547 100644 --- a/lib/vdsm/network/lldpad/lldptool.py +++ b/lib/vdsm/network/lldpad/lldptool.py @@ -1,21 +1,6 @@ # Copyright 2017-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netconfpersistence.py b/lib/vdsm/network/netconfpersistence.py index 7b944ad1fa..9ef7f06957 100644 --- a/lib/vdsm/network/netconfpersistence.py +++ b/lib/vdsm/network/netconfpersistence.py @@ -1,22 +1,6 @@ -# # Copyright 2013-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netinfo/Makefile.am b/lib/vdsm/network/netinfo/Makefile.am index 18e14d6930..e0afc1f4a8 100644 --- a/lib/vdsm/network/netinfo/Makefile.am +++ b/lib/vdsm/network/netinfo/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2015-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmnetinfo = $(vdsmpylibdir)/network/netinfo diff --git a/lib/vdsm/network/netinfo/__init__.py b/lib/vdsm/network/netinfo/__init__.py index d9c9af3201..e22a1bc670 100644 --- a/lib/vdsm/network/netinfo/__init__.py +++ b/lib/vdsm/network/netinfo/__init__.py @@ -1,23 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netinfo/addresses.py b/lib/vdsm/network/netinfo/addresses.py index 0e198f5f6c..336eee93e6 100644 --- a/lib/vdsm/network/netinfo/addresses.py +++ b/lib/vdsm/network/netinfo/addresses.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netinfo/bonding.py b/lib/vdsm/network/netinfo/bonding.py index dae0042eff..b4fe3f4328 100644 --- a/lib/vdsm/network/netinfo/bonding.py +++ b/lib/vdsm/network/netinfo/bonding.py @@ -1,21 +1,7 @@ -# # Copyright 2015-2017 Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division from functools import partial diff --git a/lib/vdsm/network/netinfo/bridges.py b/lib/vdsm/network/netinfo/bridges.py index 060b0ee5e2..eb217e932f 100644 --- a/lib/vdsm/network/netinfo/bridges.py +++ b/lib/vdsm/network/netinfo/bridges.py @@ -1,21 +1,7 @@ -# # Copyright 2015-2020 Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division from functools import partial diff --git a/lib/vdsm/network/netinfo/cache.py b/lib/vdsm/network/netinfo/cache.py index b3cfadb509..457cb34486 100644 --- a/lib/vdsm/network/netinfo/cache.py +++ b/lib/vdsm/network/netinfo/cache.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netinfo/misc.py b/lib/vdsm/network/netinfo/misc.py index ad9ae308ce..edb5a13e79 100644 --- a/lib/vdsm/network/netinfo/misc.py +++ b/lib/vdsm/network/netinfo/misc.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netinfo/nics.py b/lib/vdsm/network/netinfo/nics.py index 867d34e138..991580c1fe 100644 --- a/lib/vdsm/network/netinfo/nics.py +++ b/lib/vdsm/network/netinfo/nics.py @@ -1,21 +1,7 @@ -# # Copyright 2015-2020 Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netinfo/qos.py b/lib/vdsm/network/netinfo/qos.py index 97802bb8f3..f3071d9e65 100644 --- a/lib/vdsm/network/netinfo/qos.py +++ b/lib/vdsm/network/netinfo/qos.py @@ -1,21 +1,6 @@ -# # Copyright 2015 Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netinfo/routes.py b/lib/vdsm/network/netinfo/routes.py index 935f1f116d..d2e24397eb 100644 --- a/lib/vdsm/network/netinfo/routes.py +++ b/lib/vdsm/network/netinfo/routes.py @@ -1,21 +1,7 @@ -# # Copyright 2015 Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netlink/Makefile.am b/lib/vdsm/network/netlink/Makefile.am index 4309d0e0cf..d23b89db98 100644 --- a/lib/vdsm/network/netlink/Makefile.am +++ b/lib/vdsm/network/netlink/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmnetlinkdir = $(vdsmpylibdir)/network/netlink diff --git a/lib/vdsm/network/netlink/__init__.py b/lib/vdsm/network/netlink/__init__.py index ffdeddd3c1..7e05ab5e2f 100644 --- a/lib/vdsm/network/netlink/__init__.py +++ b/lib/vdsm/network/netlink/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netlink/addr.py b/lib/vdsm/network/netlink/addr.py index a4370b550e..def181c11e 100644 --- a/lib/vdsm/network/netlink/addr.py +++ b/lib/vdsm/network/netlink/addr.py @@ -1,21 +1,6 @@ # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netlink/libnl.py b/lib/vdsm/network/netlink/libnl.py index ec67bef619..c7cb20cdc8 100644 --- a/lib/vdsm/network/netlink/libnl.py +++ b/lib/vdsm/network/netlink/libnl.py @@ -1,20 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """libnl and libnl-route bindings. diff --git a/lib/vdsm/network/netlink/link.py b/lib/vdsm/network/netlink/link.py index 0be670b27d..91cb634459 100644 --- a/lib/vdsm/network/netlink/link.py +++ b/lib/vdsm/network/netlink/link.py @@ -1,21 +1,6 @@ # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netlink/monitor.py b/lib/vdsm/network/netlink/monitor.py index 198ff63b9b..16c726ae13 100644 --- a/lib/vdsm/network/netlink/monitor.py +++ b/lib/vdsm/network/netlink/monitor.py @@ -1,21 +1,6 @@ # Copyright 2014-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netlink/route.py b/lib/vdsm/network/netlink/route.py index 34688d933f..4308f6e654 100644 --- a/lib/vdsm/network/netlink/route.py +++ b/lib/vdsm/network/netlink/route.py @@ -1,21 +1,6 @@ # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netlink/waitfor.py b/lib/vdsm/network/netlink/waitfor.py index f5de5956d7..794af6faa4 100644 --- a/lib/vdsm/network/netlink/waitfor.py +++ b/lib/vdsm/network/netlink/waitfor.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netstats.py b/lib/vdsm/network/netstats.py index 8672a2e289..fa79e1e0c6 100644 --- a/lib/vdsm/network/netstats.py +++ b/lib/vdsm/network/netstats.py @@ -1,21 +1,6 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netswitch/Makefile.am b/lib/vdsm/network/netswitch/Makefile.am index a2069b26ca..8d98eb9a92 100644 --- a/lib/vdsm/network/netswitch/Makefile.am +++ b/lib/vdsm/network/netswitch/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmnetworknetswitchdir = $(vdsmpylibdir)/network/netswitch diff --git a/lib/vdsm/network/netswitch/__init__.py b/lib/vdsm/network/netswitch/__init__.py index 63ed722d90..36ae462d8d 100644 --- a/lib/vdsm/network/netswitch/__init__.py +++ b/lib/vdsm/network/netswitch/__init__.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netswitch/configurator.py b/lib/vdsm/network/netswitch/configurator.py index 10b05191cc..6e07782e58 100644 --- a/lib/vdsm/network/netswitch/configurator.py +++ b/lib/vdsm/network/netswitch/configurator.py @@ -1,21 +1,6 @@ # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/netswitch/validator.py b/lib/vdsm/network/netswitch/validator.py index a3ca4e9f3f..cbe18488b5 100644 --- a/lib/vdsm/network/netswitch/validator.py +++ b/lib/vdsm/network/netswitch/validator.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/nmstate/Makefile.am b/lib/vdsm/network/nmstate/Makefile.am index 3bf30afaea..24d6b425be 100644 --- a/lib/vdsm/network/nmstate/Makefile.am +++ b/lib/vdsm/network/nmstate/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later SUBDIRS = ovs diff --git a/lib/vdsm/network/nmstate/__init__.py b/lib/vdsm/network/nmstate/__init__.py index 03c33d5c16..f86881ffe0 100644 --- a/lib/vdsm/network/nmstate/__init__.py +++ b/lib/vdsm/network/nmstate/__init__.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later # Re-export public API from .api import add_dynamic_source_route_rules diff --git a/lib/vdsm/network/nmstate/api.py b/lib/vdsm/network/nmstate/api.py index c57816abc8..8323c6766e 100644 --- a/lib/vdsm/network/nmstate/api.py +++ b/lib/vdsm/network/nmstate/api.py @@ -1,21 +1,6 @@ # Copyright 2019-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging diff --git a/lib/vdsm/network/nmstate/bond.py b/lib/vdsm/network/nmstate/bond.py index 33c94abb11..3c7b444e88 100644 --- a/lib/vdsm/network/nmstate/bond.py +++ b/lib/vdsm/network/nmstate/bond.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network.link.bond.sysfs_options import BONDING_MODES_NUMBER_TO_NAME from vdsm.network.link.setup import parse_bond_options diff --git a/lib/vdsm/network/nmstate/bridge_util.py b/lib/vdsm/network/nmstate/bridge_util.py index 8ce5431dda..aab9ef4e28 100644 --- a/lib/vdsm/network/nmstate/bridge_util.py +++ b/lib/vdsm/network/nmstate/bridge_util.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network.common.switch_util import SwitchType from vdsm.network.link.iface import random_iface_name diff --git a/lib/vdsm/network/nmstate/dns.py b/lib/vdsm/network/nmstate/dns.py index 0f47f35612..e320b5a3f6 100644 --- a/lib/vdsm/network/nmstate/dns.py +++ b/lib/vdsm/network/nmstate/dns.py @@ -1,22 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later class Dns(object): def __init__(self, netconf, runconf): diff --git a/lib/vdsm/network/nmstate/ip.py b/lib/vdsm/network/nmstate/ip.py index 2bbd5608c3..42e7f84a2e 100644 --- a/lib/vdsm/network/nmstate/ip.py +++ b/lib/vdsm/network/nmstate/ip.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from .route import DEFAULT_TABLE_ID from .route import generate_table_id diff --git a/lib/vdsm/network/nmstate/linux_bridge.py b/lib/vdsm/network/nmstate/linux_bridge.py index d7e6311c02..f6a1c764f4 100644 --- a/lib/vdsm/network/nmstate/linux_bridge.py +++ b/lib/vdsm/network/nmstate/linux_bridge.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from collections import defaultdict diff --git a/lib/vdsm/network/nmstate/ovs/Makefile.am b/lib/vdsm/network/nmstate/ovs/Makefile.am index e0e6d43671..f76d7d77a2 100644 --- a/lib/vdsm/network/nmstate/ovs/Makefile.am +++ b/lib/vdsm/network/nmstate/ovs/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/nmstate/ovs/__init__.py b/lib/vdsm/network/nmstate/ovs/__init__.py index 7fcaeb54f7..f023af1c03 100644 --- a/lib/vdsm/network/nmstate/ovs/__init__.py +++ b/lib/vdsm/network/nmstate/ovs/__init__.py @@ -1,18 +1,3 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file diff --git a/lib/vdsm/network/nmstate/ovs/info.py b/lib/vdsm/network/nmstate/ovs/info.py index 53c1639e0c..d837419033 100644 --- a/lib/vdsm/network/nmstate/ovs/info.py +++ b/lib/vdsm/network/nmstate/ovs/info.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import ipaddress from collections import defaultdict diff --git a/lib/vdsm/network/nmstate/ovs/network.py b/lib/vdsm/network/nmstate/ovs/network.py index fe31336d2a..b57c8a5f13 100644 --- a/lib/vdsm/network/nmstate/ovs/network.py +++ b/lib/vdsm/network/nmstate/ovs/network.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from copy import deepcopy diff --git a/lib/vdsm/network/nmstate/route.py b/lib/vdsm/network/nmstate/route.py index a815459c2d..8fc7bac7e9 100644 --- a/lib/vdsm/network/nmstate/route.py +++ b/lib/vdsm/network/nmstate/route.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import ipaddress import zlib diff --git a/lib/vdsm/network/nmstate/schema.py b/lib/vdsm/network/nmstate/schema.py index 9946d18892..43a951a200 100644 --- a/lib/vdsm/network/nmstate/schema.py +++ b/lib/vdsm/network/nmstate/schema.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from libnmstate.schema import Bond as BondSchema from libnmstate.schema import DNS diff --git a/lib/vdsm/network/nmstate/sriov.py b/lib/vdsm/network/nmstate/sriov.py index aca04291d0..8a2e6625d7 100644 --- a/lib/vdsm/network/nmstate/sriov.py +++ b/lib/vdsm/network/nmstate/sriov.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from .schema import Ethernet from .schema import Interface diff --git a/lib/vdsm/network/nmstate/state.py b/lib/vdsm/network/nmstate/state.py index 5d4758457b..76b1f96077 100644 --- a/lib/vdsm/network/nmstate/state.py +++ b/lib/vdsm/network/nmstate/state.py @@ -1,21 +1,6 @@ # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from collections import defaultdict import itertools diff --git a/lib/vdsm/network/ovn.py b/lib/vdsm/network/ovn.py index 2e0f3b1559..a5e02cf741 100644 --- a/lib/vdsm/network/ovn.py +++ b/lib/vdsm/network/ovn.py @@ -1,20 +1,6 @@ # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import os diff --git a/lib/vdsm/network/restore_net_config.py b/lib/vdsm/network/restore_net_config.py index 9238af53f8..c11ea932be 100644 --- a/lib/vdsm/network/restore_net_config.py +++ b/lib/vdsm/network/restore_net_config.py @@ -1,21 +1,6 @@ # Copyright 2011-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/sysctl.py b/lib/vdsm/network/sysctl.py index 564c360936..ebbe188f6e 100644 --- a/lib/vdsm/network/sysctl.py +++ b/lib/vdsm/network/sysctl.py @@ -1,23 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/tc/Makefile.am b/lib/vdsm/network/tc/Makefile.am index 66a2af43bf..dd253920d1 100644 --- a/lib/vdsm/network/tc/Makefile.am +++ b/lib/vdsm/network/tc/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/tc/__init__.py b/lib/vdsm/network/tc/__init__.py index 2f385d4203..16710e4cf6 100644 --- a/lib/vdsm/network/tc/__init__.py +++ b/lib/vdsm/network/tc/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/tc/_parser.py b/lib/vdsm/network/tc/_parser.py index 95e1662f1a..538e1154fd 100644 --- a/lib/vdsm/network/tc/_parser.py +++ b/lib/vdsm/network/tc/_parser.py @@ -1,22 +1,6 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/tc/_wrapper.py b/lib/vdsm/network/tc/_wrapper.py index 2e568da58f..25ac16a294 100644 --- a/lib/vdsm/network/tc/_wrapper.py +++ b/lib/vdsm/network/tc/_wrapper.py @@ -1,21 +1,6 @@ # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/tc/cls.py b/lib/vdsm/network/tc/cls.py index 2b46be364f..88feb276ca 100644 --- a/lib/vdsm/network/tc/cls.py +++ b/lib/vdsm/network/tc/cls.py @@ -1,21 +1,6 @@ # Copyright 2014-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/tc/filter.py b/lib/vdsm/network/tc/filter.py index 0cebf6986f..bcd2df9125 100644 --- a/lib/vdsm/network/tc/filter.py +++ b/lib/vdsm/network/tc/filter.py @@ -1,21 +1,6 @@ # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/tc/qdisc.py b/lib/vdsm/network/tc/qdisc.py index 5e1e908d06..af99bbed0b 100644 --- a/lib/vdsm/network/tc/qdisc.py +++ b/lib/vdsm/network/tc/qdisc.py @@ -1,21 +1,6 @@ # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/network/validator.py b/lib/vdsm/network/validator.py index 3784845ba1..99227fac4d 100644 --- a/lib/vdsm/network/validator.py +++ b/lib/vdsm/network/validator.py @@ -1,21 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/numa.py b/lib/vdsm/numa.py index 36d94a8df7..c78cd23750 100644 --- a/lib/vdsm/numa.py +++ b/lib/vdsm/numa.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py index 65416b0407..de89690442 100644 --- a/lib/vdsm/osinfo.py +++ b/lib/vdsm/osinfo.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/ppc64HardwareInfo.py b/lib/vdsm/ppc64HardwareInfo.py index 7a95bcc114..513ef30bd1 100644 --- a/lib/vdsm/ppc64HardwareInfo.py +++ b/lib/vdsm/ppc64HardwareInfo.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/vdsm/profiling/Makefile.am b/lib/vdsm/profiling/Makefile.am index 4f2bc1de98..04da5b26d2 100644 --- a/lib/vdsm/profiling/Makefile.am +++ b/lib/vdsm/profiling/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs vdsmprofilingdir = $(vdsmpylibdir)/profiling diff --git a/lib/vdsm/profiling/__init__.py b/lib/vdsm/profiling/__init__.py index fc66204906..26c6ed5a02 100644 --- a/lib/vdsm/profiling/__init__.py +++ b/lib/vdsm/profiling/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/profiling/cpu.py b/lib/vdsm/profiling/cpu.py index 4a78fc3732..29bb2063c5 100644 --- a/lib/vdsm/profiling/cpu.py +++ b/lib/vdsm/profiling/cpu.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/profiling/errors.py b/lib/vdsm/profiling/errors.py index 1932929da9..ed19966287 100644 --- a/lib/vdsm/profiling/errors.py +++ b/lib/vdsm/profiling/errors.py @@ -1,22 +1,6 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/profiling/memory.py b/lib/vdsm/profiling/memory.py index 8a922b6f87..3b87626557 100755 --- a/lib/vdsm/profiling/memory.py +++ b/lib/vdsm/profiling/memory.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/profiling/profile.py b/lib/vdsm/profiling/profile.py index c51ca518e8..4896019fa9 100644 --- a/lib/vdsm/profiling/profile.py +++ b/lib/vdsm/profiling/profile.py @@ -1,22 +1,6 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/protocoldetector.py b/lib/vdsm/protocoldetector.py index adfb218719..b11dd472f1 100644 --- a/lib/vdsm/protocoldetector.py +++ b/lib/vdsm/protocoldetector.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/rpc/Bridge.py b/lib/vdsm/rpc/Bridge.py index 2e96fc2aba..c8e8962793 100644 --- a/lib/vdsm/rpc/Bridge.py +++ b/lib/vdsm/rpc/Bridge.py @@ -1,18 +1,7 @@ # Copyright (C) 2012 - 2017 Adam Litke, IBM Corporation # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/rpc/Makefile.am b/lib/vdsm/rpc/Makefile.am index 62b8682cc7..1753c04ad9 100644 --- a/lib/vdsm/rpc/Makefile.am +++ b/lib/vdsm/rpc/Makefile.am @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + vdsmrpcdir = $(vdsmpylibdir)/rpc dist_vdsmrpc_PYTHON = \ diff --git a/lib/vdsm/rpc/__init__.py b/lib/vdsm/rpc/__init__.py index 8d6e73bb6a..26c6ed5a02 100644 --- a/lib/vdsm/rpc/__init__.py +++ b/lib/vdsm/rpc/__init__.py @@ -1,21 +1,6 @@ # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/rpc/bindingjsonrpc.py b/lib/vdsm/rpc/bindingjsonrpc.py index 238b11799d..2a0caa9e64 100644 --- a/lib/vdsm/rpc/bindingjsonrpc.py +++ b/lib/vdsm/rpc/bindingjsonrpc.py @@ -1,18 +1,6 @@ -# VDSM JsonRPC Server # Copyright (C) 2012 Adam Litke, IBM Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/rpc/http.py b/lib/vdsm/rpc/http.py index 2b410797e2..03d0a9eb6e 100644 --- a/lib/vdsm/rpc/http.py +++ b/lib/vdsm/rpc/http.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/schedule.py b/lib/vdsm/schedule.py index daac4b6249..4f224a6fc1 100644 --- a/lib/vdsm/schedule.py +++ b/lib/vdsm/schedule.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/sslutils.py b/lib/vdsm/sslutils.py index 796cc90ee1..641a19b970 100644 --- a/lib/vdsm/sslutils.py +++ b/lib/vdsm/sslutils.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am index 1e51126db8..6a6911fca9 100644 --- a/lib/vdsm/storage/Makefile.am +++ b/lib/vdsm/storage/Makefile.am @@ -1,21 +1,7 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + SUBDIRS = protect sdm include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/storage/__init__.py b/lib/vdsm/storage/__init__.py index ac27cc0f9b..e3f295247f 100644 --- a/lib/vdsm/storage/__init__.py +++ b/lib/vdsm/storage/__init__.py @@ -1,20 +1,5 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/asyncevent.py b/lib/vdsm/storage/asyncevent.py index 356541d127..a63252b3bf 100644 --- a/lib/vdsm/storage/asyncevent.py +++ b/lib/vdsm/storage/asyncevent.py @@ -1,62 +1,8 @@ -# -# Copyright 2016-2017 Red Hat, Inc. -# +# Copyright (c) 2001, # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -# 2010, 2011, 2012, 2013, 2014, 2015 Python Software Foundation; All -# Rights Reserved -# -# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2; you -# may not use this file except in compliance with the License. -# -# PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -# -------------------------------------------- -# -# 1. This LICENSE AGREEMENT is between the Python Software Foundation -# ("PSF"), and the Individual or Organization ("Licensee") accessing and -# otherwise using this software ("Python") in source or binary form and -# its associated documentation. -# -# 2. Subject to the terms and conditions of this License Agreement, PSF -# hereby grants Licensee a nonexclusive, royalty-free, world-wide -# license to reproduce, analyze, test, perform and/or display publicly, -# prepare derivative works, distribute, and otherwise use Python alone -# or in any derivative version, provided, however, that PSF's License -# Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, -# 2013, 2014, 2015 Python Software Foundation; All Rights Reserved" are -# retained in Python alone or in any derivative version prepared by -# Licensee. -# -# 3. In the event Licensee prepares a derivative work that is based on -# or incorporates Python or any part thereof, and wants to make the -# derivative work available to others as provided herein, then Licensee -# hereby agrees to include in any such work a brief summary of the -# changes made to Python. -# -# 4. PSF is making Python available to Licensee on an "AS IS" basis. -# PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY -# WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY -# REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY -# PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY -# THIRD PARTY RIGHTS. -# -# 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -# FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A -# RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY -# DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. -# -# 6. This License Agreement will automatically terminate upon a material -# breach of its terms and conditions. -# -# 7. Nothing in this License Agreement shall be deemed to create any -# relationship of agency, partnership, or joint venture between PSF and -# Licensee. This License Agreement does not grant permission to use PSF -# trademarks or trade name in a trademark sense to endorse or promote -# products or services of Licensee, or any third party. -# -# 8. By copying, installing or otherwise using Python, Licensee agrees -# to be bound by the terms and conditions of this License Agreement. -# +# Copyright 2016-2017 Red Hat, Inc. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/asyncutils.py b/lib/vdsm/storage/asyncutils.py index 4a00b63b7a..6464292ff9 100644 --- a/lib/vdsm/storage/asyncutils.py +++ b/lib/vdsm/storage/asyncutils.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Utilties for working with the event loop. diff --git a/lib/vdsm/storage/backends.py b/lib/vdsm/storage/backends.py index 8909d39be6..41231f4932 100644 --- a/lib/vdsm/storage/backends.py +++ b/lib/vdsm/storage/backends.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/storage/bitmaps.py b/lib/vdsm/storage/bitmaps.py index 354bd9c78d..a8c97aec3d 100644 --- a/lib/vdsm/storage/bitmaps.py +++ b/lib/vdsm/storage/bitmaps.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ QEMU dirty bitmaps helper module diff --git a/lib/vdsm/storage/blkdiscard.py b/lib/vdsm/storage/blkdiscard.py index 4e4839586f..76e36225b4 100644 --- a/lib/vdsm/storage/blkdiscard.py +++ b/lib/vdsm/storage/blkdiscard.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/blockSD.py b/lib/vdsm/storage/blockSD.py index bfd0c5c3cb..659fccf95e 100644 --- a/lib/vdsm/storage/blockSD.py +++ b/lib/vdsm/storage/blockSD.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/blockVolume.py b/lib/vdsm/storage/blockVolume.py index 67379e3784..c51debbe5f 100644 --- a/lib/vdsm/storage/blockVolume.py +++ b/lib/vdsm/storage/blockVolume.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/blockdev.py b/lib/vdsm/storage/blockdev.py index fcff1fe80b..3563b3395c 100644 --- a/lib/vdsm/storage/blockdev.py +++ b/lib/vdsm/storage/blockdev.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ blockdev - data operations on block devices. diff --git a/lib/vdsm/storage/check.py b/lib/vdsm/storage/check.py index 304f43cc4a..13e8ea3ef1 100644 --- a/lib/vdsm/storage/check.py +++ b/lib/vdsm/storage/check.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ This module provides event loop based infrastructure for scalable storage diff --git a/lib/vdsm/storage/clusterlock.py b/lib/vdsm/storage/clusterlock.py index 8c725ac10a..9a58fd3924 100644 --- a/lib/vdsm/storage/clusterlock.py +++ b/lib/vdsm/storage/clusterlock.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/constants.py b/lib/vdsm/storage/constants.py index 8b4aaae30c..6ba2794261 100644 --- a/lib/vdsm/storage/constants.py +++ b/lib/vdsm/storage/constants.py @@ -1,22 +1,6 @@ -# # Copyright 2010-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/curlImgWrap.py b/lib/vdsm/storage/curlImgWrap.py index 6353d76b68..8bf01cad58 100644 --- a/lib/vdsm/storage/curlImgWrap.py +++ b/lib/vdsm/storage/curlImgWrap.py @@ -1,22 +1,6 @@ -# # Copyright 2013-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/devicemapper.py b/lib/vdsm/storage/devicemapper.py index 0e5ca9333a..00076665a1 100644 --- a/lib/vdsm/storage/devicemapper.py +++ b/lib/vdsm/storage/devicemapper.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/directio.py b/lib/vdsm/storage/directio.py index 6987ca64d1..4714e31f0f 100644 --- a/lib/vdsm/storage/directio.py +++ b/lib/vdsm/storage/directio.py @@ -1,21 +1,6 @@ # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/dispatcher.py b/lib/vdsm/storage/dispatcher.py index 057181f600..e07cd8dc4c 100644 --- a/lib/vdsm/storage/dispatcher.py +++ b/lib/vdsm/storage/dispatcher.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/dmsetup.py b/lib/vdsm/storage/dmsetup.py index a365d812ae..9bfbb68934 100644 --- a/lib/vdsm/storage/dmsetup.py +++ b/lib/vdsm/storage/dmsetup.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/exception.py b/lib/vdsm/storage/exception.py index 73d22d8f08..cf56ff6ef5 100644 --- a/lib/vdsm/storage/exception.py +++ b/lib/vdsm/storage/exception.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later ######################################################## # diff --git a/lib/vdsm/storage/fallocate.py b/lib/vdsm/storage/fallocate.py index 660bcbbd65..ba3f794718 100644 --- a/lib/vdsm/storage/fallocate.py +++ b/lib/vdsm/storage/fallocate.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ fallocate wrapping module diff --git a/lib/vdsm/storage/fileSD.py b/lib/vdsm/storage/fileSD.py index f28ee022e3..94bcd9995c 100644 --- a/lib/vdsm/storage/fileSD.py +++ b/lib/vdsm/storage/fileSD.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/fileUtils.py b/lib/vdsm/storage/fileUtils.py index 0e976cc710..75ab2be921 100644 --- a/lib/vdsm/storage/fileUtils.py +++ b/lib/vdsm/storage/fileUtils.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ NFS helper module diff --git a/lib/vdsm/storage/fileVolume.py b/lib/vdsm/storage/fileVolume.py index 159220cd52..3cdace0a01 100644 --- a/lib/vdsm/storage/fileVolume.py +++ b/lib/vdsm/storage/fileVolume.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/formatconverter.py b/lib/vdsm/storage/formatconverter.py index 732bc0d6d8..2add188d70 100644 --- a/lib/vdsm/storage/formatconverter.py +++ b/lib/vdsm/storage/formatconverter.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ FormatConverter - Responsible for the storage domains' version. diff --git a/lib/vdsm/storage/fsutils.py b/lib/vdsm/storage/fsutils.py index 01d9ca2265..254872f94d 100644 --- a/lib/vdsm/storage/fsutils.py +++ b/lib/vdsm/storage/fsutils.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import import io diff --git a/lib/vdsm/storage/fuser.py b/lib/vdsm/storage/fuser.py index ec4aa486ba..a9a408141d 100644 --- a/lib/vdsm/storage/fuser.py +++ b/lib/vdsm/storage/fuser.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/glance.py b/lib/vdsm/storage/glance.py index b648d77e5f..e09a645c19 100644 --- a/lib/vdsm/storage/glance.py +++ b/lib/vdsm/storage/glance.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Support for upload and download images to/from OpenStack Glance service. diff --git a/lib/vdsm/storage/glusterSD.py b/lib/vdsm/storage/glusterSD.py index a0deec5b8f..ba51965579 100644 --- a/lib/vdsm/storage/glusterSD.py +++ b/lib/vdsm/storage/glusterSD.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/glusterVolume.py b/lib/vdsm/storage/glusterVolume.py index bac849f5db..1a3b657a9c 100644 --- a/lib/vdsm/storage/glusterVolume.py +++ b/lib/vdsm/storage/glusterVolume.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/guarded.py b/lib/vdsm/storage/guarded.py index 98358a146b..2bfef2ac66 100644 --- a/lib/vdsm/storage/guarded.py +++ b/lib/vdsm/storage/guarded.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import import itertools diff --git a/lib/vdsm/storage/hba.py b/lib/vdsm/storage/hba.py index 9850b9db19..7f8c143354 100644 --- a/lib/vdsm/storage/hba.py +++ b/lib/vdsm/storage/hba.py @@ -1,22 +1,6 @@ -# # Copyright 2010-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Collect HBA information diff --git a/lib/vdsm/storage/hsm.py b/lib/vdsm/storage/hsm.py index 6e8f0d9084..6a65b74c99 100644 --- a/lib/vdsm/storage/hsm.py +++ b/lib/vdsm/storage/hsm.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ This is the Host Storage Manager module. diff --git a/lib/vdsm/storage/image.py b/lib/vdsm/storage/image.py index 0b0dd0f15f..80a4e37665 100644 --- a/lib/vdsm/storage/image.py +++ b/lib/vdsm/storage/image.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/imageSharing.py b/lib/vdsm/storage/imageSharing.py index 854b69f051..39f3ac56f3 100644 --- a/lib/vdsm/storage/imageSharing.py +++ b/lib/vdsm/storage/imageSharing.py @@ -1,21 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/imagetickets.py b/lib/vdsm/storage/imagetickets.py index 3589495c44..1ef73a3004 100644 --- a/lib/vdsm/storage/imagetickets.py +++ b/lib/vdsm/storage/imagetickets.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/iscsi.py b/lib/vdsm/storage/iscsi.py index f44052527c..b54bcfde8f 100644 --- a/lib/vdsm/storage/iscsi.py +++ b/lib/vdsm/storage/iscsi.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ iSCSI service module. Provides helper functions to interact with iscsiadm diff --git a/lib/vdsm/storage/iscsiadm.py b/lib/vdsm/storage/iscsiadm.py index 67cae723b0..7bf185992a 100644 --- a/lib/vdsm/storage/iscsiadm.py +++ b/lib/vdsm/storage/iscsiadm.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/localFsSD.py b/lib/vdsm/storage/localFsSD.py index cce9e84bf3..88d8a619c9 100644 --- a/lib/vdsm/storage/localFsSD.py +++ b/lib/vdsm/storage/localFsSD.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/lsof.py b/lib/vdsm/storage/lsof.py index 021a87a0a3..19b142fc2d 100644 --- a/lib/vdsm/storage/lsof.py +++ b/lib/vdsm/storage/lsof.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import os diff --git a/lib/vdsm/storage/lvm.py b/lib/vdsm/storage/lvm.py index f9fc4a8159..4ae5714bd7 100644 --- a/lib/vdsm/storage/lvm.py +++ b/lib/vdsm/storage/lvm.py @@ -1,23 +1,6 @@ -# # Copyright 2010-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Generic LVM interface wrapper diff --git a/lib/vdsm/storage/lvmconf.py b/lib/vdsm/storage/lvmconf.py index 62605cb0a3..e779a36388 100644 --- a/lib/vdsm/storage/lvmconf.py +++ b/lib/vdsm/storage/lvmconf.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ lvmconf - Access LVM configuration file diff --git a/lib/vdsm/storage/lvmdevices.py b/lib/vdsm/storage/lvmdevices.py index 7ac560cf13..6ae793ae82 100644 --- a/lib/vdsm/storage/lvmdevices.py +++ b/lib/vdsm/storage/lvmdevices.py @@ -1,22 +1,7 @@ -# # Copyright 2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Manage LVM devices and LVM devices file. diff --git a/lib/vdsm/storage/lvmfilter.py b/lib/vdsm/storage/lvmfilter.py index 6e1f0f94ef..9b46f947b2 100644 --- a/lib/vdsm/storage/lvmfilter.py +++ b/lib/vdsm/storage/lvmfilter.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ lvmfilter - Generate LVM filter diff --git a/lib/vdsm/storage/mailbox.py b/lib/vdsm/storage/mailbox.py index e0d9e25d7f..c0e0e56ee8 100644 --- a/lib/vdsm/storage/mailbox.py +++ b/lib/vdsm/storage/mailbox.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/storage/managedvolume.py b/lib/vdsm/storage/managedvolume.py index 4a4e6619de..9ace95df3a 100644 --- a/lib/vdsm/storage/managedvolume.py +++ b/lib/vdsm/storage/managedvolume.py @@ -1,22 +1,6 @@ -# # Copyright 2010-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ diff --git a/lib/vdsm/storage/managedvolumedb.py b/lib/vdsm/storage/managedvolumedb.py index f382c66430..d1bf6f2fa5 100644 --- a/lib/vdsm/storage/managedvolumedb.py +++ b/lib/vdsm/storage/managedvolumedb.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ managevolumedb - stores connection details about managed volumes diff --git a/lib/vdsm/storage/merge.py b/lib/vdsm/storage/merge.py index 5ca298f52c..db2fcc02d7 100644 --- a/lib/vdsm/storage/merge.py +++ b/lib/vdsm/storage/merge.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ This is first step of cold merge flow. diff --git a/lib/vdsm/storage/misc.py b/lib/vdsm/storage/misc.py index 8797172db0..30d1a0053d 100644 --- a/lib/vdsm/storage/misc.py +++ b/lib/vdsm/storage/misc.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later # FIXME: A lot of methods here use DD. A smart thing would be to wrap DD in a # method that does all the arg concatenation and stream handling once. Also diff --git a/lib/vdsm/storage/monitor.py b/lib/vdsm/storage/monitor.py index 247fb5ba59..cd7d17fd93 100644 --- a/lib/vdsm/storage/monitor.py +++ b/lib/vdsm/storage/monitor.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/mount.py b/lib/vdsm/storage/mount.py index 48f72c6928..aaa93b5065 100644 --- a/lib/vdsm/storage/mount.py +++ b/lib/vdsm/storage/mount.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/mpathconf.py b/lib/vdsm/storage/mpathconf.py index e3cf637597..9b1376827e 100644 --- a/lib/vdsm/storage/mpathconf.py +++ b/lib/vdsm/storage/mpathconf.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ This module provides multipath configuration functionality over the host: diff --git a/lib/vdsm/storage/mpathhealth.py b/lib/vdsm/storage/mpathhealth.py index 137c94c953..f39920dfa5 100644 --- a/lib/vdsm/storage/mpathhealth.py +++ b/lib/vdsm/storage/mpathhealth.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/multipath.py b/lib/vdsm/storage/multipath.py index 74108e0691..7a55d88031 100644 --- a/lib/vdsm/storage/multipath.py +++ b/lib/vdsm/storage/multipath.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ multipath module provides helper procedures for configuring multipath diff --git a/lib/vdsm/storage/nbd.py b/lib/vdsm/storage/nbd.py index a46e50a3a0..1eff722f22 100644 --- a/lib/vdsm/storage/nbd.py +++ b/lib/vdsm/storage/nbd.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ NBD - manage network block devices diff --git a/lib/vdsm/storage/nfsSD.py b/lib/vdsm/storage/nfsSD.py index 68e882a30c..7bee29d9b6 100644 --- a/lib/vdsm/storage/nfsSD.py +++ b/lib/vdsm/storage/nfsSD.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/nos_brick.py b/lib/vdsm/storage/nos_brick.py index e8f3d8c53b..277c0e25dc 100644 --- a/lib/vdsm/storage/nos_brick.py +++ b/lib/vdsm/storage/nos_brick.py @@ -1,17 +1,7 @@ # Copyright (c) 2018, Red Hat, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """Helper code to attach/detach out of OpenStack OS-Brick is meant to be used within OpenStack, which means that there are some diff --git a/lib/vdsm/storage/operation.py b/lib/vdsm/storage/operation.py index a53593c498..c9368aa36f 100644 --- a/lib/vdsm/storage/operation.py +++ b/lib/vdsm/storage/operation.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/outOfProcess.py b/lib/vdsm/storage/outOfProcess.py index 3c90e7415f..9bb71fcc08 100644 --- a/lib/vdsm/storage/outOfProcess.py +++ b/lib/vdsm/storage/outOfProcess.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/persistent.py b/lib/vdsm/storage/persistent.py index 213187211d..0eb7fcf5d9 100644 --- a/lib/vdsm/storage/persistent.py +++ b/lib/vdsm/storage/persistent.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ persistent module provides generic class with common verification and diff --git a/lib/vdsm/storage/protect/Makefile.am b/lib/vdsm/storage/protect/Makefile.am index 24b7205a61..4f33d974d3 100644 --- a/lib/vdsm/storage/protect/Makefile.am +++ b/lib/vdsm/storage/protect/Makefile.am @@ -1,10 +1,6 @@ # Copyright 2008 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/storage/qemuimg.py b/lib/vdsm/storage/qemuimg.py index 4156654686..9c4099885f 100644 --- a/lib/vdsm/storage/qemuimg.py +++ b/lib/vdsm/storage/qemuimg.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import import json diff --git a/lib/vdsm/storage/resourceFactories.py b/lib/vdsm/storage/resourceFactories.py index a0baff0d3a..e50828112c 100644 --- a/lib/vdsm/storage/resourceFactories.py +++ b/lib/vdsm/storage/resourceFactories.py @@ -1,22 +1,6 @@ -# # Copyright 2010-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/resourceManager.py b/lib/vdsm/storage/resourceManager.py index 976117f284..375fffc916 100644 --- a/lib/vdsm/storage/resourceManager.py +++ b/lib/vdsm/storage/resourceManager.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/rwlock.py b/lib/vdsm/storage/rwlock.py index d74c8dd815..25cee88394 100644 --- a/lib/vdsm/storage/rwlock.py +++ b/lib/vdsm/storage/rwlock.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import import threading diff --git a/lib/vdsm/storage/sanlock_direct.py b/lib/vdsm/storage/sanlock_direct.py index 7871c4d397..a21c1c9608 100644 --- a/lib/vdsm/storage/sanlock_direct.py +++ b/lib/vdsm/storage/sanlock_direct.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import os diff --git a/lib/vdsm/storage/sanlockconf.py b/lib/vdsm/storage/sanlockconf.py index 5594d09485..34ed876d6f 100644 --- a/lib/vdsm/storage/sanlockconf.py +++ b/lib/vdsm/storage/sanlockconf.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Read and write sanlock configuration file. diff --git a/lib/vdsm/storage/sd.py b/lib/vdsm/storage/sd.py index 36c393b5a4..59c79132ed 100644 --- a/lib/vdsm/storage/sd.py +++ b/lib/vdsm/storage/sd.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdc.py b/lib/vdsm/storage/sdc.py index f8d44087b0..0cbcd0cff4 100644 --- a/lib/vdsm/storage/sdc.py +++ b/lib/vdsm/storage/sdc.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Cache module provides general purpose (more or less) cache infrastructure diff --git a/lib/vdsm/storage/sdm/Makefile.am b/lib/vdsm/storage/sdm/Makefile.am index fe50b5d51b..775222efb9 100644 --- a/lib/vdsm/storage/sdm/Makefile.am +++ b/lib/vdsm/storage/sdm/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later SUBDIRS = api diff --git a/lib/vdsm/storage/sdm/__init__.py b/lib/vdsm/storage/sdm/__init__.py index f2712bdcce..d30313509d 100644 --- a/lib/vdsm/storage/sdm/__init__.py +++ b/lib/vdsm/storage/sdm/__init__.py @@ -1,21 +1,5 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdm/api/Makefile.am b/lib/vdsm/storage/sdm/api/Makefile.am index 3873bb740e..95c2b3cf80 100644 --- a/lib/vdsm/storage/sdm/api/Makefile.am +++ b/lib/vdsm/storage/sdm/api/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/storage/sdm/api/__init__.py b/lib/vdsm/storage/sdm/api/__init__.py index f2712bdcce..d30313509d 100644 --- a/lib/vdsm/storage/sdm/api/__init__.py +++ b/lib/vdsm/storage/sdm/api/__init__.py @@ -1,21 +1,5 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdm/api/add_bitmap.py b/lib/vdsm/storage/sdm/api/add_bitmap.py index 2430cd4ca6..a6e5f72f9f 100644 --- a/lib/vdsm/storage/sdm/api/add_bitmap.py +++ b/lib/vdsm/storage/sdm/api/add_bitmap.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.common import errors from vdsm.storage import bitmaps diff --git a/lib/vdsm/storage/sdm/api/amend_volume.py b/lib/vdsm/storage/sdm/api/amend_volume.py index 60918c6e0e..54ee045dcd 100644 --- a/lib/vdsm/storage/sdm/api/amend_volume.py +++ b/lib/vdsm/storage/sdm/api/amend_volume.py @@ -1,23 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdm/api/base.py b/lib/vdsm/storage/sdm/api/base.py index 5734f339c3..6b6277f4b3 100644 --- a/lib/vdsm/storage/sdm/api/base.py +++ b/lib/vdsm/storage/sdm/api/base.py @@ -1,22 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdm/api/clear_bitmaps.py b/lib/vdsm/storage/sdm/api/clear_bitmaps.py index 350f76282b..c684386db0 100644 --- a/lib/vdsm/storage/sdm/api/clear_bitmaps.py +++ b/lib/vdsm/storage/sdm/api/clear_bitmaps.py @@ -1,22 +1,6 @@ -# # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.storage import bitmaps from vdsm.storage import constants as sc diff --git a/lib/vdsm/storage/sdm/api/copy_data.py b/lib/vdsm/storage/sdm/api/copy_data.py index 1f95747da1..d98aa45dea 100644 --- a/lib/vdsm/storage/sdm/api/copy_data.py +++ b/lib/vdsm/storage/sdm/api/copy_data.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from contextlib import contextmanager diff --git a/lib/vdsm/storage/sdm/api/merge.py b/lib/vdsm/storage/sdm/api/merge.py index 36535de0c8..7ac9f9efb8 100644 --- a/lib/vdsm/storage/sdm/api/merge.py +++ b/lib/vdsm/storage/sdm/api/merge.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ This is (cold) merge data operation job. diff --git a/lib/vdsm/storage/sdm/api/move_device.py b/lib/vdsm/storage/sdm/api/move_device.py index 95238f6dc0..880f097179 100644 --- a/lib/vdsm/storage/sdm/api/move_device.py +++ b/lib/vdsm/storage/sdm/api/move_device.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdm/api/reduce_domain.py b/lib/vdsm/storage/sdm/api/reduce_domain.py index b55f362895..e6a0d5871d 100644 --- a/lib/vdsm/storage/sdm/api/reduce_domain.py +++ b/lib/vdsm/storage/sdm/api/reduce_domain.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdm/api/remove_bitmap.py b/lib/vdsm/storage/sdm/api/remove_bitmap.py index b3e889c697..449de75414 100644 --- a/lib/vdsm/storage/sdm/api/remove_bitmap.py +++ b/lib/vdsm/storage/sdm/api/remove_bitmap.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.common import errors from vdsm.storage import bitmaps diff --git a/lib/vdsm/storage/sdm/api/sparsify_volume.py b/lib/vdsm/storage/sdm/api/sparsify_volume.py index 045cfb8a12..572373fc51 100644 --- a/lib/vdsm/storage/sdm/api/sparsify_volume.py +++ b/lib/vdsm/storage/sdm/api/sparsify_volume.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdm/api/update_volume.py b/lib/vdsm/storage/sdm/api/update_volume.py index 33e2ea77a6..a4f5a7f533 100644 --- a/lib/vdsm/storage/sdm/api/update_volume.py +++ b/lib/vdsm/storage/sdm/api/update_volume.py @@ -1,23 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sdm/volume_info.py b/lib/vdsm/storage/sdm/volume_info.py index b2295ab65b..59a17d2d9b 100644 --- a/lib/vdsm/storage/sdm/volume_info.py +++ b/lib/vdsm/storage/sdm/volume_info.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/securable.py b/lib/vdsm/storage/securable.py index 1544ffcb13..88374c238d 100644 --- a/lib/vdsm/storage/securable.py +++ b/lib/vdsm/storage/securable.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import import inspect diff --git a/lib/vdsm/storage/sp.py b/lib/vdsm/storage/sp.py index b69efff95b..236b226883 100644 --- a/lib/vdsm/storage/sp.py +++ b/lib/vdsm/storage/sp.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/spbackends.py b/lib/vdsm/storage/spbackends.py index 111753034d..7536a6774d 100644 --- a/lib/vdsm/storage/spbackends.py +++ b/lib/vdsm/storage/spbackends.py @@ -1,22 +1,6 @@ -# # Copyright 2013-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/spwd.py b/lib/vdsm/storage/spwd.py index 0a62893f76..9c664cbaf0 100644 --- a/lib/vdsm/storage/spwd.py +++ b/lib/vdsm/storage/spwd.py @@ -1,22 +1,6 @@ -# # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import threading diff --git a/lib/vdsm/storage/storageServer.py b/lib/vdsm/storage/storageServer.py index 0d11cce1f8..753b4b89da 100644 --- a/lib/vdsm/storage/storageServer.py +++ b/lib/vdsm/storage/storageServer.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/sysfs.py b/lib/vdsm/storage/sysfs.py index f9cef4f176..bb1a943032 100644 --- a/lib/vdsm/storage/sysfs.py +++ b/lib/vdsm/storage/sysfs.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ sysfs - helper for accessing sysfs attributes. diff --git a/lib/vdsm/storage/task.py b/lib/vdsm/storage/task.py index e3cd71d485..032dfbf411 100644 --- a/lib/vdsm/storage/task.py +++ b/lib/vdsm/storage/task.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later ''' Tasks: tasks object model some sort of VDSM task (storage task). diff --git a/lib/vdsm/storage/taskManager.py b/lib/vdsm/storage/taskManager.py index 15a90be15c..ca4e20c955 100644 --- a/lib/vdsm/storage/taskManager.py +++ b/lib/vdsm/storage/taskManager.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import import os diff --git a/lib/vdsm/storage/threadPool.py b/lib/vdsm/storage/threadPool.py index 6ea9b7f986..4251c3ce05 100644 --- a/lib/vdsm/storage/threadPool.py +++ b/lib/vdsm/storage/threadPool.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + # # Adapted by Red Hat from # http://code.activestate.com/recipes/203871-a-generic-programming-thread-pool/ diff --git a/lib/vdsm/storage/transientdisk.py b/lib/vdsm/storage/transientdisk.py index 55fe6cddb9..d50cbdcf35 100644 --- a/lib/vdsm/storage/transientdisk.py +++ b/lib/vdsm/storage/transientdisk.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/storage/utils.py b/lib/vdsm/storage/utils.py index 98e4ff241b..9f2dbbf323 100644 --- a/lib/vdsm/storage/utils.py +++ b/lib/vdsm/storage/utils.py @@ -1,22 +1,7 @@ -# # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from vdsm.storage import constants as sc diff --git a/lib/vdsm/storage/validators.py b/lib/vdsm/storage/validators.py index 2b3c5de4d4..52e4bcedda 100644 --- a/lib/vdsm/storage/validators.py +++ b/lib/vdsm/storage/validators.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ validators - Vdsm storage types and validators diff --git a/lib/vdsm/storage/volume.py b/lib/vdsm/storage/volume.py index f9134d89d9..50d06376bb 100644 --- a/lib/vdsm/storage/volume.py +++ b/lib/vdsm/storage/volume.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/volumemetadata.py b/lib/vdsm/storage/volumemetadata.py index 46d91cbe29..48071dc17c 100644 --- a/lib/vdsm/storage/volumemetadata.py +++ b/lib/vdsm/storage/volumemetadata.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/workarounds.py b/lib/vdsm/storage/workarounds.py index ba820b58ce..75db6315b6 100644 --- a/lib/vdsm/storage/workarounds.py +++ b/lib/vdsm/storage/workarounds.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/storage/xlease.py b/lib/vdsm/storage/xlease.py index 1ab7160c6c..426ae25dd2 100644 --- a/lib/vdsm/storage/xlease.py +++ b/lib/vdsm/storage/xlease.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ xlease - manage external leases diff --git a/lib/vdsm/supervdsm_api/Makefile.am b/lib/vdsm/supervdsm_api/Makefile.am index f6dfb4e8a2..7800077b6b 100644 --- a/lib/vdsm/supervdsm_api/Makefile.am +++ b/lib/vdsm/supervdsm_api/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs supervdsm_apidir = $(vdsmpylibdir)/supervdsm_api diff --git a/lib/vdsm/supervdsm_api/__init__.py b/lib/vdsm/supervdsm_api/__init__.py index 1a544ecdc6..b92e995795 100644 --- a/lib/vdsm/supervdsm_api/__init__.py +++ b/lib/vdsm/supervdsm_api/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/devicemapper.py b/lib/vdsm/supervdsm_api/devicemapper.py index 5a95d692ce..35189bc073 100644 --- a/lib/vdsm/supervdsm_api/devicemapper.py +++ b/lib/vdsm/supervdsm_api/devicemapper.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/dmsetup.py b/lib/vdsm/supervdsm_api/dmsetup.py index 347dbb9a57..5694c86c05 100644 --- a/lib/vdsm/supervdsm_api/dmsetup.py +++ b/lib/vdsm/supervdsm_api/dmsetup.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/hwinfo.py b/lib/vdsm/supervdsm_api/hwinfo.py index 0815bf0daa..abcd0a1af4 100644 --- a/lib/vdsm/supervdsm_api/hwinfo.py +++ b/lib/vdsm/supervdsm_api/hwinfo.py @@ -1,21 +1,6 @@ # Copyright 2016-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/ksm.py b/lib/vdsm/supervdsm_api/ksm.py index b71dac0395..ede86b92aa 100644 --- a/lib/vdsm/supervdsm_api/ksm.py +++ b/lib/vdsm/supervdsm_api/ksm.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/lsof.py b/lib/vdsm/supervdsm_api/lsof.py index 43e5a1036c..59eeae0b54 100644 --- a/lib/vdsm/supervdsm_api/lsof.py +++ b/lib/vdsm/supervdsm_api/lsof.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.storage import lsof from . import expose diff --git a/lib/vdsm/supervdsm_api/managedvolume.py b/lib/vdsm/supervdsm_api/managedvolume.py index bce436e35d..2d66b2ac77 100644 --- a/lib/vdsm/supervdsm_api/managedvolume.py +++ b/lib/vdsm/supervdsm_api/managedvolume.py @@ -1,21 +1,6 @@ # Copyright 2018-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/mkimage.py b/lib/vdsm/supervdsm_api/mkimage.py index 85306e3fb8..dc48c83ff6 100644 --- a/lib/vdsm/supervdsm_api/mkimage.py +++ b/lib/vdsm/supervdsm_api/mkimage.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/multipath.py b/lib/vdsm/supervdsm_api/multipath.py index 98f92a2648..7e8339109d 100644 --- a/lib/vdsm/supervdsm_api/multipath.py +++ b/lib/vdsm/supervdsm_api/multipath.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/nbd.py b/lib/vdsm/supervdsm_api/nbd.py index 701225f16d..9c67821536 100644 --- a/lib/vdsm/supervdsm_api/nbd.py +++ b/lib/vdsm/supervdsm_api/nbd.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/network.py b/lib/vdsm/supervdsm_api/network.py index b6ba0d9f22..6d1d7623a2 100644 --- a/lib/vdsm/supervdsm_api/network.py +++ b/lib/vdsm/supervdsm_api/network.py @@ -1,21 +1,6 @@ # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/sanlock_direct.py b/lib/vdsm/supervdsm_api/sanlock_direct.py index 6b324b106d..5776cd0a91 100644 --- a/lib/vdsm/supervdsm_api/sanlock_direct.py +++ b/lib/vdsm/supervdsm_api/sanlock_direct.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.storage import sanlock_direct from vdsm.storage import constants as sc diff --git a/lib/vdsm/supervdsm_api/saslpasswd2.py b/lib/vdsm/supervdsm_api/saslpasswd2.py index 8060ec1806..c6f795c0aa 100644 --- a/lib/vdsm/supervdsm_api/saslpasswd2.py +++ b/lib/vdsm/supervdsm_api/saslpasswd2.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/supervdsm_api/systemctl.py b/lib/vdsm/supervdsm_api/systemctl.py index bb62a80c1a..468741c9e5 100644 --- a/lib/vdsm/supervdsm_api/systemctl.py +++ b/lib/vdsm/supervdsm_api/systemctl.py @@ -1,21 +1,6 @@ # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/test.py b/lib/vdsm/supervdsm_api/test.py index 4e0e59271a..2b32e2388e 100644 --- a/lib/vdsm/supervdsm_api/test.py +++ b/lib/vdsm/supervdsm_api/test.py @@ -1,21 +1,6 @@ # Copyright 2011-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_api/udev.py b/lib/vdsm/supervdsm_api/udev.py index 07137c0782..83fd948e37 100644 --- a/lib/vdsm/supervdsm_api/udev.py +++ b/lib/vdsm/supervdsm_api/udev.py @@ -1,21 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ General udev utilities diff --git a/lib/vdsm/supervdsm_api/virt.py b/lib/vdsm/supervdsm_api/virt.py index 45618f9bb5..dd59b1a660 100644 --- a/lib/vdsm/supervdsm_api/virt.py +++ b/lib/vdsm/supervdsm_api/virt.py @@ -1,21 +1,6 @@ # Copyright 2016-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/supervdsm_server.py b/lib/vdsm/supervdsm_server.py index 0ec7dc62d6..991f1b4bd9 100644 --- a/lib/vdsm/supervdsm_server.py +++ b/lib/vdsm/supervdsm_server.py @@ -1,21 +1,6 @@ # Copyright 2011-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/taskset.py b/lib/vdsm/taskset.py index 072d95584f..e4ece9854f 100644 --- a/lib/vdsm/taskset.py +++ b/lib/vdsm/taskset.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/throttledlog.py b/lib/vdsm/throttledlog.py index e73f5ee812..161359dbc4 100644 --- a/lib/vdsm/throttledlog.py +++ b/lib/vdsm/throttledlog.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/tool/Makefile.am b/lib/vdsm/tool/Makefile.am index 9dfaa81bee..9aff9704ce 100644 --- a/lib/vdsm/tool/Makefile.am +++ b/lib/vdsm/tool/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2013-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + SUBDIRS=configurators include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/tool/__init__.py b/lib/vdsm/tool/__init__.py index 9bf7241659..04677e399e 100644 --- a/lib/vdsm/tool/__init__.py +++ b/lib/vdsm/tool/__init__.py @@ -1,21 +1,6 @@ # Copyright 2011 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/check_volume_leases.py b/lib/vdsm/tool/check_volume_leases.py index 5269ce6127..06d0f23883 100644 --- a/lib/vdsm/tool/check_volume_leases.py +++ b/lib/vdsm/tool/check_volume_leases.py @@ -1,21 +1,6 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/common.py b/lib/vdsm/tool/common.py index 37d6128fbc..5dfdd94d02 100644 --- a/lib/vdsm/tool/common.py +++ b/lib/vdsm/tool/common.py @@ -1,21 +1,6 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/config_lvm_filter.py b/lib/vdsm/tool/config_lvm_filter.py index 15c80f4b0e..7ddabcc299 100644 --- a/lib/vdsm/tool/config_lvm_filter.py +++ b/lib/vdsm/tool/config_lvm_filter.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configfile.py b/lib/vdsm/tool/configfile.py index 5fd629afd9..a10328def6 100644 --- a/lib/vdsm/tool/configfile.py +++ b/lib/vdsm/tool/configfile.py @@ -1,21 +1,6 @@ # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py index ba6eb126b2..34fd0f3eb7 100644 --- a/lib/vdsm/tool/configurator.py +++ b/lib/vdsm/tool/configurator.py @@ -1,21 +1,6 @@ # Copyright 2013-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurators/Makefile.am b/lib/vdsm/tool/configurators/Makefile.am index 483ff258de..55ef5fd913 100644 --- a/lib/vdsm/tool/configurators/Makefile.am +++ b/lib/vdsm/tool/configurators/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2014-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + include $(top_srcdir)/build-aux/Makefile.subs dist_configurators_PYTHON = \ diff --git a/lib/vdsm/tool/configurators/__init__.py b/lib/vdsm/tool/configurators/__init__.py index a52d60f8f0..92c8855f34 100644 --- a/lib/vdsm/tool/configurators/__init__.py +++ b/lib/vdsm/tool/configurators/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurators/bond_defaults.py b/lib/vdsm/tool/configurators/bond_defaults.py index 49f6dc59aa..d5871844c9 100644 --- a/lib/vdsm/tool/configurators/bond_defaults.py +++ b/lib/vdsm/tool/configurators/bond_defaults.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurators/certificates.py b/lib/vdsm/tool/configurators/certificates.py index 82c0c7d189..c00de6fb5a 100644 --- a/lib/vdsm/tool/configurators/certificates.py +++ b/lib/vdsm/tool/configurators/certificates.py @@ -1,21 +1,6 @@ # Copyright 2016-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py index 1256ed95ca..34013fba15 100644 --- a/lib/vdsm/tool/configurators/libvirt.py +++ b/lib/vdsm/tool/configurators/libvirt.py @@ -1,21 +1,6 @@ # Copyright 2014-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurators/lvm.py b/lib/vdsm/tool/configurators/lvm.py index 00506adb98..c3d3615552 100644 --- a/lib/vdsm/tool/configurators/lvm.py +++ b/lib/vdsm/tool/configurators/lvm.py @@ -1,21 +1,6 @@ # Copyright 2017-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import errno import sys diff --git a/lib/vdsm/tool/configurators/managedvolumedb.py b/lib/vdsm/tool/configurators/managedvolumedb.py index b1567ed341..4e0c7f9e3e 100644 --- a/lib/vdsm/tool/configurators/managedvolumedb.py +++ b/lib/vdsm/tool/configurators/managedvolumedb.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurators/multipath.py b/lib/vdsm/tool/configurators/multipath.py index bc9896dcbc..9f38bc8c80 100644 --- a/lib/vdsm/tool/configurators/multipath.py +++ b/lib/vdsm/tool/configurators/multipath.py @@ -1,21 +1,6 @@ # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurators/passwd.py b/lib/vdsm/tool/configurators/passwd.py index bc683e74e8..99aad59655 100644 --- a/lib/vdsm/tool/configurators/passwd.py +++ b/lib/vdsm/tool/configurators/passwd.py @@ -1,21 +1,6 @@ # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/configurators/sanlock.py b/lib/vdsm/tool/configurators/sanlock.py index 431f82042a..4942df4cfa 100644 --- a/lib/vdsm/tool/configurators/sanlock.py +++ b/lib/vdsm/tool/configurators/sanlock.py @@ -1,21 +1,6 @@ # Copyright 2014-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import grp import os diff --git a/lib/vdsm/tool/configurators/sebool.py b/lib/vdsm/tool/configurators/sebool.py index 625cb666e7..b034e1b92c 100644 --- a/lib/vdsm/tool/configurators/sebool.py +++ b/lib/vdsm/tool/configurators/sebool.py @@ -1,21 +1,6 @@ # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/confmeta.py b/lib/vdsm/tool/confmeta.py index 62de112407..7bf0aa1349 100644 --- a/lib/vdsm/tool/confmeta.py +++ b/lib/vdsm/tool/confmeta.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/confutils.py b/lib/vdsm/tool/confutils.py index 2b48a58954..fa184ac959 100644 --- a/lib/vdsm/tool/confutils.py +++ b/lib/vdsm/tool/confutils.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/dummybr.py b/lib/vdsm/tool/dummybr.py index 48fe9816f3..955157e271 100644 --- a/lib/vdsm/tool/dummybr.py +++ b/lib/vdsm/tool/dummybr.py @@ -1,21 +1,6 @@ # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/dump_volume_chains.py b/lib/vdsm/tool/dump_volume_chains.py index 51301211d9..eaf7e30836 100644 --- a/lib/vdsm/tool/dump_volume_chains.py +++ b/lib/vdsm/tool/dump_volume_chains.py @@ -1,21 +1,6 @@ # Copyright 2015-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/network.py b/lib/vdsm/tool/network.py index a1f60ba311..e335f5048a 100644 --- a/lib/vdsm/tool/network.py +++ b/lib/vdsm/tool/network.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/nwfilter.py b/lib/vdsm/tool/nwfilter.py index 5346327537..6075a25a79 100755 --- a/lib/vdsm/tool/nwfilter.py +++ b/lib/vdsm/tool/nwfilter.py @@ -1,22 +1,6 @@ # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/register.py b/lib/vdsm/tool/register.py index 7b14710093..f0fe0bdba1 100644 --- a/lib/vdsm/tool/register.py +++ b/lib/vdsm/tool/register.py @@ -1,19 +1,7 @@ # Copyright (C) 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. A copy of the GNU General Public License is -# also available at http://www.gnu.org/copyleft/gpl.html. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division import argparse diff --git a/lib/vdsm/tool/service.py b/lib/vdsm/tool/service.py index 2714c18ebb..2a60ea2b97 100644 --- a/lib/vdsm/tool/service.py +++ b/lib/vdsm/tool/service.py @@ -1,22 +1,7 @@ # Copyright 2013 IBM, Inc. # Copyright 2017, 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/transient.py b/lib/vdsm/tool/transient.py index 02ecf72aa7..2c36288042 100644 --- a/lib/vdsm/tool/transient.py +++ b/lib/vdsm/tool/transient.py @@ -1,21 +1,6 @@ # Copyright 2013-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/upgrade.py b/lib/vdsm/tool/upgrade.py index b2ca2ec211..aecc9fa29d 100644 --- a/lib/vdsm/tool/upgrade.py +++ b/lib/vdsm/tool/upgrade.py @@ -1,21 +1,6 @@ # Copyright 2013-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/vdsm-id.py b/lib/vdsm/tool/vdsm-id.py index d1050a0f54..c6482adafc 100644 --- a/lib/vdsm/tool/vdsm-id.py +++ b/lib/vdsm/tool/vdsm-id.py @@ -1,21 +1,6 @@ # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/tool/vdsm_config.py b/lib/vdsm/tool/vdsm_config.py index 2cbef9aaff..9ae278d5ee 100644 --- a/lib/vdsm/tool/vdsm_config.py +++ b/lib/vdsm/tool/vdsm_config.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.common import config from . import expose diff --git a/lib/vdsm/tool/xleases.py b/lib/vdsm/tool/xleases.py index 2519ca8743..d5e016ecca 100644 --- a/lib/vdsm/tool/xleases.py +++ b/lib/vdsm/tool/xleases.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import import argparse diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index c3e4a69cbc..0957921d8e 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/v2v.py b/lib/vdsm/v2v.py index 9652285d05..19759e93a2 100644 --- a/lib/vdsm/v2v.py +++ b/lib/vdsm/v2v.py @@ -1,21 +1,7 @@ # Copyright 2014-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ When importing a VM a thread start with a new process of virt-v2v. The way to feedback the information on the progress and the status of the diff --git a/lib/vdsm/vdsmd.py b/lib/vdsm/vdsmd.py index 6a72541736..92222335d6 100755 --- a/lib/vdsm/vdsmd.py +++ b/lib/vdsm/vdsmd.py @@ -1,11 +1,6 @@ -# # Copyright 2009-2021 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/lib/vdsm/virt/Makefile.am b/lib/vdsm/virt/Makefile.am index 707fa21aeb..931aeec4ee 100644 --- a/lib/vdsm/virt/Makefile.am +++ b/lib/vdsm/virt/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/virt/__init__.py b/lib/vdsm/virt/__init__.py index 2d2c3cfc0b..e92bed6f1f 100644 --- a/lib/vdsm/virt/__init__.py +++ b/lib/vdsm/virt/__init__.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/backup.py b/lib/vdsm/virt/backup.py index 810f52bcc6..8b2da51472 100644 --- a/lib/vdsm/virt/backup.py +++ b/lib/vdsm/virt/backup.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import os diff --git a/lib/vdsm/virt/blockjob.py b/lib/vdsm/virt/blockjob.py index a279bfc672..564bca1d4e 100644 --- a/lib/vdsm/virt/blockjob.py +++ b/lib/vdsm/virt/blockjob.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/cpumanagement.py b/lib/vdsm/virt/cpumanagement.py index 44ee5dfc2f..82f7ec5587 100644 --- a/lib/vdsm/virt/cpumanagement.py +++ b/lib/vdsm/virt/cpumanagement.py @@ -1,20 +1,6 @@ # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import libvirt import threading diff --git a/lib/vdsm/virt/displaynetwork.py b/lib/vdsm/virt/displaynetwork.py index cec7ff3a98..abcfdbfc2c 100644 --- a/lib/vdsm/virt/displaynetwork.py +++ b/lib/vdsm/virt/displaynetwork.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/domain_descriptor.py b/lib/vdsm/virt/domain_descriptor.py index 75d3c360e4..b1c20f73aa 100644 --- a/lib/vdsm/virt/domain_descriptor.py +++ b/lib/vdsm/virt/domain_descriptor.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/domxml_preprocess.py b/lib/vdsm/virt/domxml_preprocess.py index 27f900d992..d0d483a89c 100644 --- a/lib/vdsm/virt/domxml_preprocess.py +++ b/lib/vdsm/virt/domxml_preprocess.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/errors.py b/lib/vdsm/virt/errors.py index e8efd9c830..154fcbfc7b 100644 --- a/lib/vdsm/virt/errors.py +++ b/lib/vdsm/virt/errors.py @@ -1,22 +1,6 @@ -# # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Internal errors. diff --git a/lib/vdsm/virt/events.py b/lib/vdsm/virt/events.py index 40acae8c14..4284a2d67e 100644 --- a/lib/vdsm/virt/events.py +++ b/lib/vdsm/virt/events.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/externaldata.py b/lib/vdsm/virt/externaldata.py index 8315750447..6759a1dbbb 100644 --- a/lib/vdsm/virt/externaldata.py +++ b/lib/vdsm/virt/externaldata.py @@ -1,20 +1,6 @@ # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from collections import namedtuple from enum import Enum diff --git a/lib/vdsm/virt/filedata.py b/lib/vdsm/virt/filedata.py index 0ff8d40200..d12d0e051f 100644 --- a/lib/vdsm/virt/filedata.py +++ b/lib/vdsm/virt/filedata.py @@ -1,20 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Refer to the README and COPYING files for full details of the license. - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import base64 import binascii diff --git a/lib/vdsm/virt/guestagent.py b/lib/vdsm/virt/guestagent.py index 50e15101f3..0137d4efb8 100644 --- a/lib/vdsm/virt/guestagent.py +++ b/lib/vdsm/virt/guestagent.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/guestagenthelpers.py b/lib/vdsm/virt/guestagenthelpers.py index 50d0326010..eec23f66a0 100644 --- a/lib/vdsm/virt/guestagenthelpers.py +++ b/lib/vdsm/virt/guestagenthelpers.py @@ -1,22 +1,6 @@ -# # Copyright 2018-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/jobs/Makefile.am b/lib/vdsm/virt/jobs/Makefile.am index ed6f2185a0..cd1f464f38 100644 --- a/lib/vdsm/virt/jobs/Makefile.am +++ b/lib/vdsm/virt/jobs/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/virt/jobs/__init__.py b/lib/vdsm/virt/jobs/__init__.py index ec72682504..340b68d901 100644 --- a/lib/vdsm/virt/jobs/__init__.py +++ b/lib/vdsm/virt/jobs/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/jobs/seal.py b/lib/vdsm/virt/jobs/seal.py index 588da3f3a5..006a720b97 100644 --- a/lib/vdsm/virt/jobs/seal.py +++ b/lib/vdsm/virt/jobs/seal.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ This module implements a job that runs virt-sysprep utility over all disks of a diff --git a/lib/vdsm/virt/jobs/snapshot.py b/lib/vdsm/virt/jobs/snapshot.py index b875cfb105..bf2ea548f6 100644 --- a/lib/vdsm/virt/jobs/snapshot.py +++ b/lib/vdsm/virt/jobs/snapshot.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ This module implements a job that creates a snapshot for a given VM. diff --git a/lib/vdsm/virt/libvirthook/Makefile.am b/lib/vdsm/virt/libvirthook/Makefile.am index d451395c91..45976fe557 100644 --- a/lib/vdsm/virt/libvirthook/Makefile.am +++ b/lib/vdsm/virt/libvirthook/Makefile.am @@ -1,21 +1,6 @@ # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/virt/libvirthook/__init__.py b/lib/vdsm/virt/libvirthook/__init__.py index e69de29bb2..7cec2738df 100644 --- a/lib/vdsm/virt/libvirthook/__init__.py +++ b/lib/vdsm/virt/libvirthook/__init__.py @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file diff --git a/lib/vdsm/virt/libvirthook/vm_libvirt_hook.py b/lib/vdsm/virt/libvirthook/vm_libvirt_hook.py index d5a214ac54..b667450b19 100755 --- a/lib/vdsm/virt/libvirthook/vm_libvirt_hook.py +++ b/lib/vdsm/virt/libvirthook/vm_libvirt_hook.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 # Copyright 2016-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import sys import xml.etree.ElementTree as ET diff --git a/lib/vdsm/virt/libvirtnetwork.py b/lib/vdsm/virt/libvirtnetwork.py index d1d22a1ceb..136d9d99d4 100644 --- a/lib/vdsm/virt/libvirtnetwork.py +++ b/lib/vdsm/virt/libvirtnetwork.py @@ -1,21 +1,6 @@ # Copyright 2011-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/libvirtxml.py b/lib/vdsm/virt/libvirtxml.py index 51e59be7e0..e578dc8946 100644 --- a/lib/vdsm/virt/libvirtxml.py +++ b/lib/vdsm/virt/libvirtxml.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/livemerge.py b/lib/vdsm/virt/livemerge.py index 8e21c74265..9bfce5dc98 100644 --- a/lib/vdsm/virt/livemerge.py +++ b/lib/vdsm/virt/livemerge.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import threading diff --git a/lib/vdsm/virt/metadata.py b/lib/vdsm/virt/metadata.py index dd88944473..e619c16857 100644 --- a/lib/vdsm/virt/metadata.py +++ b/lib/vdsm/virt/metadata.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/migration.py b/lib/vdsm/virt/migration.py index 69d66672ac..213704fbfe 100644 --- a/lib/vdsm/virt/migration.py +++ b/lib/vdsm/virt/migration.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/periodic.py b/lib/vdsm/virt/periodic.py index f98e01bb8a..c0186686b5 100644 --- a/lib/vdsm/virt/periodic.py +++ b/lib/vdsm/virt/periodic.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/qemuguestagent.py b/lib/vdsm/virt/qemuguestagent.py index ef606acd58..fee6d18753 100644 --- a/lib/vdsm/virt/qemuguestagent.py +++ b/lib/vdsm/virt/qemuguestagent.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/recovery.py b/lib/vdsm/virt/recovery.py index dfb47abbfb..e799126457 100644 --- a/lib/vdsm/virt/recovery.py +++ b/lib/vdsm/virt/recovery.py @@ -1,22 +1,6 @@ -# # Copyright 2011-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/sampling.py b/lib/vdsm/virt/sampling.py index f964eca980..c1bcda5920 100644 --- a/lib/vdsm/virt/sampling.py +++ b/lib/vdsm/virt/sampling.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/saslpasswd2.py b/lib/vdsm/virt/saslpasswd2.py index b175471055..45066eecba 100644 --- a/lib/vdsm/virt/saslpasswd2.py +++ b/lib/vdsm/virt/saslpasswd2.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/lib/vdsm/virt/secret.py b/lib/vdsm/virt/secret.py index 419a64bf1f..1276b1d0f5 100644 --- a/lib/vdsm/virt/secret.py +++ b/lib/vdsm/virt/secret.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/thinp.py b/lib/vdsm/virt/thinp.py index 5eb36adba2..4af2e1feed 100644 --- a/lib/vdsm/virt/thinp.py +++ b/lib/vdsm/virt/thinp.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import re import sys diff --git a/lib/vdsm/virt/utils.py b/lib/vdsm/virt/utils.py index 17639f7358..4479dd1050 100644 --- a/lib/vdsm/virt/utils.py +++ b/lib/vdsm/virt/utils.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/virdomain.py b/lib/vdsm/virt/virdomain.py index c2bb40f7bb..c06c616806 100644 --- a/lib/vdsm/virt/virdomain.py +++ b/lib/vdsm/virt/virdomain.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vm.py b/lib/vdsm/virt/vm.py index d59ebdc284..8abe68beba 100644 --- a/lib/vdsm/virt/vm.py +++ b/lib/vdsm/virt/vm.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmchannels.py b/lib/vdsm/virt/vmchannels.py index f67c411f7d..0b7e0ae80c 100644 --- a/lib/vdsm/virt/vmchannels.py +++ b/lib/vdsm/virt/vmchannels.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/Makefile.am b/lib/vdsm/virt/vmdevices/Makefile.am index bdc266d7d7..48802d37e0 100644 --- a/lib/vdsm/virt/vmdevices/Makefile.am +++ b/lib/vdsm/virt/vmdevices/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + vmdevicesdir = $(vdsmpylibdir)/virt/vmdevices dist_vmdevices_PYTHON = \ diff --git a/lib/vdsm/virt/vmdevices/__init__.py b/lib/vdsm/virt/vmdevices/__init__.py index 6817241fc7..fd781d6be7 100644 --- a/lib/vdsm/virt/vmdevices/__init__.py +++ b/lib/vdsm/virt/vmdevices/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/common.py b/lib/vdsm/virt/vmdevices/common.py index c060998205..0a6e7942a4 100644 --- a/lib/vdsm/virt/vmdevices/common.py +++ b/lib/vdsm/virt/vmdevices/common.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/compat.py b/lib/vdsm/virt/vmdevices/compat.py index 4f8cee686c..53e535db70 100644 --- a/lib/vdsm/virt/vmdevices/compat.py +++ b/lib/vdsm/virt/vmdevices/compat.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/core.py b/lib/vdsm/virt/vmdevices/core.py index 3965a7b400..bbf7f58517 100644 --- a/lib/vdsm/virt/vmdevices/core.py +++ b/lib/vdsm/virt/vmdevices/core.py @@ -1,23 +1,6 @@ -# # Copyright 2014-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# pylint: disable=no-member +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/drivename.py b/lib/vdsm/virt/vmdevices/drivename.py index 6ea4f4314d..bbb7213559 100644 --- a/lib/vdsm/virt/vmdevices/drivename.py +++ b/lib/vdsm/virt/vmdevices/drivename.py @@ -1,21 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/graphics.py b/lib/vdsm/virt/vmdevices/graphics.py index 4f018b890d..5d75d46fd0 100644 --- a/lib/vdsm/virt/vmdevices/graphics.py +++ b/lib/vdsm/virt/vmdevices/graphics.py @@ -1,23 +1,6 @@ -# # Copyright 2008-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# pylint: disable=no-member +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/hostdevice.py b/lib/vdsm/virt/vmdevices/hostdevice.py index 0dd364c91b..961de41d31 100644 --- a/lib/vdsm/virt/vmdevices/hostdevice.py +++ b/lib/vdsm/virt/vmdevices/hostdevice.py @@ -1,23 +1,6 @@ -# # Copyright 2015-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# pylint: disable=no-member +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/hwclass.py b/lib/vdsm/virt/vmdevices/hwclass.py index c6c591e7ac..19d5f0125e 100644 --- a/lib/vdsm/virt/vmdevices/hwclass.py +++ b/lib/vdsm/virt/vmdevices/hwclass.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/lease.py b/lib/vdsm/virt/vmdevices/lease.py index 8510c69661..b4e9802e63 100644 --- a/lib/vdsm/virt/vmdevices/lease.py +++ b/lib/vdsm/virt/vmdevices/lease.py @@ -1,23 +1,6 @@ -# # Copyright 2016-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# pylint: disable=no-member +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ lease - manage lease devices in the virt subsystem. diff --git a/lib/vdsm/virt/vmdevices/lookup.py b/lib/vdsm/virt/vmdevices/lookup.py index a39dd8c701..54decf010f 100644 --- a/lib/vdsm/virt/vmdevices/lookup.py +++ b/lib/vdsm/virt/vmdevices/lookup.py @@ -1,22 +1,6 @@ -# # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/network.py b/lib/vdsm/virt/vmdevices/network.py index 9ca41d1b6b..57a43ecb82 100644 --- a/lib/vdsm/virt/vmdevices/network.py +++ b/lib/vdsm/virt/vmdevices/network.py @@ -1,23 +1,6 @@ -# # Copyright 2008-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# pylint: disable=no-member +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/storage.py b/lib/vdsm/virt/vmdevices/storage.py index 69ccfb1de6..e63f92e3ce 100644 --- a/lib/vdsm/virt/vmdevices/storage.py +++ b/lib/vdsm/virt/vmdevices/storage.py @@ -1,23 +1,6 @@ -# # Copyright 2008-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# pylint: disable=no-member +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmdevices/storagexml.py b/lib/vdsm/virt/vmdevices/storagexml.py index 4bdc72eb08..5a25b79895 100644 --- a/lib/vdsm/virt/vmdevices/storagexml.py +++ b/lib/vdsm/virt/vmdevices/storagexml.py @@ -1,21 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmexitreason.py b/lib/vdsm/virt/vmexitreason.py index e103225816..538df5193c 100644 --- a/lib/vdsm/virt/vmexitreason.py +++ b/lib/vdsm/virt/vmexitreason.py @@ -1,22 +1,6 @@ -# # Copyright 2014,2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmpowerdown.py b/lib/vdsm/virt/vmpowerdown.py index 1e3f98e721..9f16003822 100644 --- a/lib/vdsm/virt/vmpowerdown.py +++ b/lib/vdsm/virt/vmpowerdown.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmstats.py b/lib/vdsm/virt/vmstats.py index 6d74e71808..5e00de06de 100644 --- a/lib/vdsm/virt/vmstats.py +++ b/lib/vdsm/virt/vmstats.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmstatus.py b/lib/vdsm/virt/vmstatus.py index e4431bb984..92619fc3d6 100644 --- a/lib/vdsm/virt/vmstatus.py +++ b/lib/vdsm/virt/vmstatus.py @@ -1,22 +1,6 @@ -# # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmtune.py b/lib/vdsm/virt/vmtune.py index bb1ed4c14b..194b5ab16d 100644 --- a/lib/vdsm/virt/vmtune.py +++ b/lib/vdsm/virt/vmtune.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/vmxml.py b/lib/vdsm/virt/vmxml.py index 5d190cf6ff..966837ca60 100644 --- a/lib/vdsm/virt/vmxml.py +++ b/lib/vdsm/virt/vmxml.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virt/xmlconstants.py b/lib/vdsm/virt/xmlconstants.py index 33324a5a51..ac335d207b 100644 --- a/lib/vdsm/virt/xmlconstants.py +++ b/lib/vdsm/virt/xmlconstants.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/virtsparsify.py b/lib/vdsm/virtsparsify.py index ebbc008f92..3fe469911e 100644 --- a/lib/vdsm/virtsparsify.py +++ b/lib/vdsm/virtsparsify.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.virt.utils import LibguestfsCommand diff --git a/lib/vdsm/virtsysprep.py b/lib/vdsm/virtsysprep.py index 386c4de20d..88ae0cf4fa 100644 --- a/lib/vdsm/virtsysprep.py +++ b/lib/vdsm/virtsysprep.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.virt.utils import LibguestfsCommand diff --git a/lib/vdsmclient/Makefile.am b/lib/vdsmclient/Makefile.am index 92370dc2b9..ad4b7ccadc 100644 --- a/lib/vdsmclient/Makefile.am +++ b/lib/vdsmclient/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later vdsmclientdir = $(pythondir)/vdsmclient diff --git a/lib/vdsmclient/__init__.py b/lib/vdsmclient/__init__.py index 4b567633f1..e92bed6f1f 100644 --- a/lib/vdsmclient/__init__.py +++ b/lib/vdsmclient/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsmclient/client.py b/lib/vdsmclient/client.py index debbb2c32e..06c42088e5 100644 --- a/lib/vdsmclient/client.py +++ b/lib/vdsmclient/client.py @@ -1,22 +1,7 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ vdsm-client - simple Vdsm jsonrpc client diff --git a/lib/yajsonrpc/Makefile.am b/lib/yajsonrpc/Makefile.am index 1e1f1cd8d5..f43dd8ec6c 100644 --- a/lib/yajsonrpc/Makefile.am +++ b/lib/yajsonrpc/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2008-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later yajsonrpcdir = $(pythondir)/yajsonrpc diff --git a/lib/yajsonrpc/__init__.py b/lib/yajsonrpc/__init__.py index aba3e04354..b862621337 100644 --- a/lib/yajsonrpc/__init__.py +++ b/lib/yajsonrpc/__init__.py @@ -1,18 +1,8 @@ -# Copyright (C) 2014-2019 Red Hat Inc. # Copyright (C) 2014 Saggi Mizrahi, Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Copyright (C) 2014-2019 Red Hat Inc. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division import logging diff --git a/lib/yajsonrpc/betterAsyncore.py b/lib/yajsonrpc/betterAsyncore.py index 92905bacbe..9ca6bce4f1 100644 --- a/lib/yajsonrpc/betterAsyncore.py +++ b/lib/yajsonrpc/betterAsyncore.py @@ -1,17 +1,6 @@ # Copyright (C) 2014-2017 Saggi Mizrahi, Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later # Asyncore uses inheritance all around which makes it not flexible enough for # us to use. This does tries to reuse enough code from the original asyncore diff --git a/lib/yajsonrpc/exception.py b/lib/yajsonrpc/exception.py index 3128fcaa34..36d10f0970 100644 --- a/lib/yajsonrpc/exception.py +++ b/lib/yajsonrpc/exception.py @@ -1,17 +1,7 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/lib/yajsonrpc/jsonrpcclient.py b/lib/yajsonrpc/jsonrpcclient.py index b0128f999b..b23615eee3 100644 --- a/lib/yajsonrpc/jsonrpcclient.py +++ b/lib/yajsonrpc/jsonrpcclient.py @@ -1,17 +1,7 @@ # Copyright (C) 2017-2019 Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py index 77e22e2a1f..0093ef0679 100644 --- a/lib/yajsonrpc/stomp.py +++ b/lib/yajsonrpc/stomp.py @@ -1,18 +1,7 @@ -# Copyright 2014-2019 Red Hat, Inc. # Copyright (C) 2014 Saggi Mizrahi, Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Copyright 2014-2019 Red Hat, Inc. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/yajsonrpc/stompclient.py b/lib/yajsonrpc/stompclient.py index ea9c458b76..f2a3509d16 100644 --- a/lib/yajsonrpc/stompclient.py +++ b/lib/yajsonrpc/stompclient.py @@ -1,17 +1,7 @@ # Copyright (C) 2017 Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/lib/yajsonrpc/stompserver.py b/lib/yajsonrpc/stompserver.py index 0b6db4d4a2..6f580da7db 100644 --- a/lib/yajsonrpc/stompserver.py +++ b/lib/yajsonrpc/stompserver.py @@ -1,17 +1,6 @@ # Copyright (C) 2014-2017 Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/static/Makefile.am b/static/Makefile.am index eb76b0ae67..2107357727 100644 --- a/static/Makefile.am +++ b/static/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/static/libexec/vdsm/sitecustomize.py b/static/libexec/vdsm/sitecustomize.py index 28c2fe03c7..64100aa3e7 100644 --- a/static/libexec/vdsm/sitecustomize.py +++ b/static/libexec/vdsm/sitecustomize.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from vdsm.config import config if config.getboolean('devel', 'coverage_enable'): diff --git a/tests/API_test.py b/tests/API_test.py index 1b5f095664..9b37f715a8 100644 --- a/tests/API_test.py +++ b/tests/API_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/Makefile.am b/tests/Makefile.am index e4fd451c6d..3b2e073346 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/tests/alignmentscan_test.py b/tests/alignmentscan_test.py index 470cbe3af8..c0cd314792 100644 --- a/tests/alignmentscan_test.py +++ b/tests/alignmentscan_test.py @@ -1,23 +1,7 @@ -# -# Copyright (c) 2016 Red Hat, Inc. # Copyright (c) 2012, Sasha Tomic -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# Copyright (c) 2016 Red Hat, Inc. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/apiData.py b/tests/apiData.py index fe9f90a79a..3e8c549740 100644 --- a/tests/apiData.py +++ b/tests/apiData.py @@ -1,22 +1,6 @@ -# # Copyright 2012 Adam Litke, IBM Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/api_response_test.py b/tests/api_response_test.py index 52a227758b..063d82afb1 100644 --- a/tests/api_response_test.py +++ b/tests/api_response_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/better_asyncore_test.py b/tests/better_asyncore_test.py index c4356e2077..40fe333482 100644 --- a/tests/better_asyncore_test.py +++ b/tests/better_asyncore_test.py @@ -1,23 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/caps_test.py b/tests/caps_test.py index bdbece30e6..0652476e99 100644 --- a/tests/caps_test.py +++ b/tests/caps_test.py @@ -1,24 +1,6 @@ -# -*- coding: utf-8 -*- -# # Copyright 2012-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/check_imports.py b/tests/check_imports.py index 3fe3b0081f..05cf989103 100644 --- a/tests/check_imports.py +++ b/tests/check_imports.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/clientif_test.py b/tests/clientif_test.py index e4de68ac09..e6fb64ddae 100644 --- a/tests/clientif_test.py +++ b/tests/clientif_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/cmdutils_test.py b/tests/cmdutils_test.py index 2d56a8cf29..a7221d00ac 100644 --- a/tests/cmdutils_test.py +++ b/tests/cmdutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/__init__.py b/tests/common/__init__.py index c1c62327ac..e92bed6f1f 100644 --- a/tests/common/__init__.py +++ b/tests/common/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/cache_test.py b/tests/common/cache_test.py index 2c4335a300..54366956eb 100644 --- a/tests/common/cache_test.py +++ b/tests/common/cache_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/cmdutils_test.py b/tests/common/cmdutils_test.py index f5903265a3..9fc4bd5582 100644 --- a/tests/common/cmdutils_test.py +++ b/tests/common/cmdutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/commands_test.py b/tests/common/commands_test.py index 4bbcdab548..b3ad5716e7 100644 --- a/tests/common/commands_test.py +++ b/tests/common/commands_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/concurrent_test.py b/tests/common/concurrent_test.py index 7d6e15e091..dd31902036 100644 --- a/tests/common/concurrent_test.py +++ b/tests/common/concurrent_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/fileutils_test.py b/tests/common/fileutils_test.py index 17417367c9..ac94a480eb 100644 --- a/tests/common/fileutils_test.py +++ b/tests/common/fileutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/function_test.py b/tests/common/function_test.py index 2bb15ce10f..cdfac1c214 100644 --- a/tests/common/function_test.py +++ b/tests/common/function_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/hostutils_test.py b/tests/common/hostutils_test.py index de4af673bb..3b7d7e111d 100644 --- a/tests/common/hostutils_test.py +++ b/tests/common/hostutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/libvirtconnection_test.py b/tests/common/libvirtconnection_test.py index 871eafb1dc..8dd0e7d3df 100644 --- a/tests/common/libvirtconnection_test.py +++ b/tests/common/libvirtconnection_test.py @@ -1,23 +1,6 @@ -# # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/logutils_test.py b/tests/common/logutils_test.py index 7c49408354..f63b6a5128 100644 --- a/tests/common/logutils_test.py +++ b/tests/common/logutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/network_test.py b/tests/common/network_test.py index 878346c553..960d419f9d 100644 --- a/tests/common/network_test.py +++ b/tests/common/network_test.py @@ -1,21 +1,6 @@ # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/osutils_test.py b/tests/common/osutils_test.py index e6780ba783..2ddf04e21c 100644 --- a/tests/common/osutils_test.py +++ b/tests/common/osutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/proc_test.py b/tests/common/proc_test.py index eb440bce3f..fd4c2bcb3e 100644 --- a/tests/common/proc_test.py +++ b/tests/common/proc_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/properties_test.py b/tests/common/properties_test.py index 14f03bb559..f292cc0f6f 100644 --- a/tests/common/properties_test.py +++ b/tests/common/properties_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import base64 diff --git a/tests/common/pthread_test.py b/tests/common/pthread_test.py index a9e27e7262..9c040ca896 100644 --- a/tests/common/pthread_test.py +++ b/tests/common/pthread_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/systemctl_test.py b/tests/common/systemctl_test.py index 4f3cae86b6..a1c669c60d 100644 --- a/tests/common/systemctl_test.py +++ b/tests/common/systemctl_test.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/systemd_test.py b/tests/common/systemd_test.py index 4999b89983..244c87fc93 100644 --- a/tests/common/systemd_test.py +++ b/tests/common/systemd_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/common/time_test.py b/tests/common/time_test.py index 43d572fd26..bcddc38659 100644 --- a/tests/common/time_test.py +++ b/tests/common/time_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest from vdsm.common import time diff --git a/tests/common/validate_test.py b/tests/common/validate_test.py index 12d789320b..94bf0d4eea 100644 --- a/tests/common/validate_test.py +++ b/tests/common/validate_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/config_test.py b/tests/config_test.py index 41bdb197d6..636e86d761 100644 --- a/tests/config_test.py +++ b/tests/config_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/conftest.py b/tests/conftest.py index 29a5b9d200..7e676e9158 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Common fixtures that can be used without importing anything. diff --git a/tests/cpu_profile_test.py b/tests/cpu_profile_test.py index ab457727ec..5e12ec72cc 100644 --- a/tests/cpu_profile_test.py +++ b/tests/cpu_profile_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/cpuinfo_test.py b/tests/cpuinfo_test.py index d6e5828484..f31b5af1f6 100644 --- a/tests/cpuinfo_test.py +++ b/tests/cpuinfo_test.py @@ -1,23 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/devices/__init__.py b/tests/devices/__init__.py index a4065adb18..50799cba6d 100644 --- a/tests/devices/__init__.py +++ b/tests/devices/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/devices/parsing/__init__.py b/tests/devices/parsing/__init__.py index a4065adb18..50799cba6d 100644 --- a/tests/devices/parsing/__init__.py +++ b/tests/devices/parsing/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/devices/parsing/complex_vm_test.py b/tests/devices/parsing/complex_vm_test.py index f197371916..546042c512 100644 --- a/tests/devices/parsing/complex_vm_test.py +++ b/tests/devices/parsing/complex_vm_test.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division import os diff --git a/tests/domcaps_test.py b/tests/domcaps_test.py index 5fdfa6d80d..3198245e93 100644 --- a/tests/domcaps_test.py +++ b/tests/domcaps_test.py @@ -1,24 +1,7 @@ -# -# Copyright 2017 IBM Corp. # Copyright 2012-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# Copyright 2017 IBM Corp. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/eventfd_test.py b/tests/eventfd_test.py index 84147462bd..a6f1cdc641 100644 --- a/tests/eventfd_test.py +++ b/tests/eventfd_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/exception_test.py b/tests/exception_test.py index 0327a0e0d1..b188ed4dbf 100644 --- a/tests/exception_test.py +++ b/tests/exception_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/executor_test.py b/tests/executor_test.py index 93a560fc6b..cd67021c88 100644 --- a/tests/executor_test.py +++ b/tests/executor_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/fakelib.py b/tests/fakelib.py index d772b66b39..9568e735f9 100644 --- a/tests/fakelib.py +++ b/tests/fakelib.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/fakemetadatalib.py b/tests/fakemetadatalib.py index 81134dc5be..7ad5d5c4a5 100644 --- a/tests/fakemetadatalib.py +++ b/tests/fakemetadatalib.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/filecontrol_test.py b/tests/filecontrol_test.py index 0dfaf3e25f..af904bb546 100644 --- a/tests/filecontrol_test.py +++ b/tests/filecontrol_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py index a4065adb18..50799cba6d 100644 --- a/tests/functional/__init__.py +++ b/tests/functional/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/functional/momTests.py b/tests/functional/momTests.py index 91e94decb9..8ee22e0a61 100644 --- a/tests/functional/momTests.py +++ b/tests/functional/momTests.py @@ -1,22 +1,6 @@ -# # Copyright IBM Corp. 2012 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/functional/supervdsmFuncTests.py b/tests/functional/supervdsmFuncTests.py index e03cd1a365..1d39f65863 100644 --- a/tests/functional/supervdsmFuncTests.py +++ b/tests/functional/supervdsmFuncTests.py @@ -1,21 +1,6 @@ # Copyright 2013-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/functional/upgrade_vdsm_test.py b/tests/functional/upgrade_vdsm_test.py index 53cfacd3b2..4640e79386 100644 --- a/tests/functional/upgrade_vdsm_test.py +++ b/tests/functional/upgrade_vdsm_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 046f49b93e..be51540bc6 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -1,21 +1,6 @@ -# # Copyright 2013-2017 Red Hat, Inc. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/fuser_test.py b/tests/fuser_test.py index 58be6fdb85..311756696b 100644 --- a/tests/fuser_test.py +++ b/tests/fuser_test.py @@ -1,22 +1,6 @@ -# # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/glob_test.py b/tests/glob_test.py index 96cd117c2e..6721055c89 100644 --- a/tests/glob_test.py +++ b/tests/glob_test.py @@ -1,62 +1,8 @@ -# -# Copyright 2017 Red Hat, Inc. -# +# Copyright (c) 2001, # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -# 2010, 2011, 2012, 2013, 2014, 2015 Python Software Foundation; All -# Rights Reserved -# -# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2; you -# may not use this file except in compliance with the License. -# -# PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -# -------------------------------------------- -# -# 1. This LICENSE AGREEMENT is between the Python Software Foundation -# ("PSF"), and the Individual or Organization ("Licensee") accessing and -# otherwise using this software ("Python") in source or binary form and -# its associated documentation. -# -# 2. Subject to the terms and conditions of this License Agreement, PSF -# hereby grants Licensee a nonexclusive, royalty-free, world-wide -# license to reproduce, analyze, test, perform and/or display publicly, -# prepare derivative works, distribute, and otherwise use Python alone -# or in any derivative version, provided, however, that PSF's License -# Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, -# 2013, 2014, 2015 Python Software Foundation; All Rights Reserved" are -# retained in Python alone or in any derivative version prepared by -# Licensee. -# -# 3. In the event Licensee prepares a derivative work that is based on -# or incorporates Python or any part thereof, and wants to make the -# derivative work available to others as provided herein, then Licensee -# hereby agrees to include in any such work a brief summary of the -# changes made to Python. -# -# 4. PSF is making Python available to Licensee on an "AS IS" basis. -# PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY -# WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY -# REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY -# PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY -# THIRD PARTY RIGHTS. -# -# 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -# FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A -# RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY -# DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. -# -# 6. This License Agreement will automatically terminate upon a material -# breach of its terms and conditions. -# -# 7. Nothing in this License Agreement shall be deemed to create any -# relationship of agency, partnership, or joint venture between PSF and -# Licensee. This License Agreement does not grant permission to use PSF -# trademarks or trade name in a trademark sense to endorse or promote -# products or services of Licensee, or any third party. -# -# 8. By copying, installing or otherwise using Python, Licensee agrees -# to be bound by the terms and conditions of this License Agreement. -# +# Copyright 2017 Red Hat, Inc. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/gluster/__init__.py b/tests/gluster/__init__.py index e017ba2ece..5d4e631603 100644 --- a/tests/gluster/__init__.py +++ b/tests/gluster/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/gluster/cli_test.py b/tests/gluster/cli_test.py index 20eb18017f..01a740dbf9 100644 --- a/tests/gluster/cli_test.py +++ b/tests/gluster/cli_test.py @@ -1,23 +1,7 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/gluster/hooks_test.py b/tests/gluster/hooks_test.py index 55ae96b1bf..418ea56742 100644 --- a/tests/gluster/hooks_test.py +++ b/tests/gluster/hooks_test.py @@ -1,23 +1,7 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/glusterTestData.py b/tests/glusterTestData.py index ed455c9c22..c76aca8416 100644 --- a/tests/glusterTestData.py +++ b/tests/glusterTestData.py @@ -1,22 +1,6 @@ -# # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/gluster_cli_test.py b/tests/gluster_cli_test.py index 133b0fc383..624661b6e9 100644 --- a/tests/gluster_cli_test.py +++ b/tests/gluster_cli_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/gluster_exception_test.py b/tests/gluster_exception_test.py index 293fe09637..b77608a530 100644 --- a/tests/gluster_exception_test.py +++ b/tests/gluster_exception_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/gluster_thinstorage_test.py b/tests/gluster_thinstorage_test.py index ce99068b0a..005c07e43d 100644 --- a/tests/gluster_thinstorage_test.py +++ b/tests/gluster_thinstorage_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/hooking_test.py b/tests/hooking_test.py index d4514af1b5..15a8e516ee 100644 --- a/tests/hooking_test.py +++ b/tests/hooking_test.py @@ -1,24 +1,6 @@ -# encoding: utf-8 -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/hooks/vhostmd_test.py b/tests/hooks/vhostmd_test.py index 1b77809298..ed3bc8d076 100644 --- a/tests/hooks/vhostmd_test.py +++ b/tests/hooks/vhostmd_test.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/hostdev_test.py b/tests/hostdev_test.py index 8f6b4b5a6d..42f00424f7 100644 --- a/tests/hostdev_test.py +++ b/tests/hostdev_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/hostdevlib.py b/tests/hostdevlib.py index e54c90399c..fe0631f8c1 100644 --- a/tests/hostdevlib.py +++ b/tests/hostdevlib.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/hoststats_test.py b/tests/hoststats_test.py index 5a695e3fbb..d6fbff3dc8 100644 --- a/tests/hoststats_test.py +++ b/tests/hoststats_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/hugepages_test.py b/tests/hugepages_test.py index f7645c7c1f..43c8f1ab97 100644 --- a/tests/hugepages_test.py +++ b/tests/hugepages_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/hwinfo_test.py b/tests/hwinfo_test.py index 33099ca510..314e604b0d 100644 --- a/tests/hwinfo_test.py +++ b/tests/hwinfo_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index a4065adb18..50799cba6d 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/integration/jsonRpcHelper.py b/tests/integration/jsonRpcHelper.py index 029959a13e..e6e322ec7f 100644 --- a/tests/integration/jsonRpcHelper.py +++ b/tests/integration/jsonRpcHelper.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/integration/sslhelper.py b/tests/integration/sslhelper.py index 8bab0089fb..200ca42af2 100644 --- a/tests/integration/sslhelper.py +++ b/tests/integration/sslhelper.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License diff --git a/tests/jobs_test.py b/tests/jobs_test.py index e31456c0c4..522a5797e7 100644 --- a/tests/jobs_test.py +++ b/tests/jobs_test.py @@ -1,21 +1,6 @@ # Copyright 2015-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/jsonRpcClient_test.py b/tests/jsonRpcClient_test.py index 05fb3e43bd..5e388fac4c 100644 --- a/tests/jsonRpcClient_test.py +++ b/tests/jsonRpcClient_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/jsonrpc_test.py b/tests/jsonrpc_test.py index 22862b203c..4580260792 100644 --- a/tests/jsonrpc_test.py +++ b/tests/jsonrpc_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/kvm2ovirt_test.py b/tests/kvm2ovirt_test.py index 8d9aa1abe6..38529b2583 100644 --- a/tests/kvm2ovirt_test.py +++ b/tests/kvm2ovirt_test.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/bridge_test.py b/tests/lib/bridge_test.py index 9a4d4afd27..60e6443952 100644 --- a/tests/lib/bridge_test.py +++ b/tests/lib/bridge_test.py @@ -1,23 +1,6 @@ -# # Copyright 2014-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/hooks_test.py b/tests/lib/hooks_test.py index 0f20b9e99d..f3550d8c4a 100644 --- a/tests/lib/hooks_test.py +++ b/tests/lib/hooks_test.py @@ -1,22 +1,6 @@ # Copyright 2012-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/osinfo_test.py b/tests/lib/osinfo_test.py index 65f3672120..557438878a 100644 --- a/tests/lib/osinfo_test.py +++ b/tests/lib/osinfo_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/protocoldetector_test.py b/tests/lib/protocoldetector_test.py index 32405e943e..507f0c2394 100644 --- a/tests/lib/protocoldetector_test.py +++ b/tests/lib/protocoldetector_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/rpc/http_detector_test.py b/tests/lib/rpc/http_detector_test.py index a0fb918ee7..2670231cd8 100644 --- a/tests/lib/rpc/http_detector_test.py +++ b/tests/lib/rpc/http_detector_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/tests/lib/rpc/http_image_request_handler_test.py b/tests/lib/rpc/http_image_request_handler_test.py index a96ee370b3..d43a698486 100644 --- a/tests/lib/rpc/http_image_request_handler_test.py +++ b/tests/lib/rpc/http_image_request_handler_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/tests/lib/utils_test.py b/tests/lib/utils_test.py index 6f46904f72..2ced65f22d 100644 --- a/tests/lib/utils_test.py +++ b/tests/lib/utils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/yajsonrpc/encoding_test.py b/tests/lib/yajsonrpc/encoding_test.py index aaec0cbe23..bf357d2e4a 100644 --- a/tests/lib/yajsonrpc/encoding_test.py +++ b/tests/lib/yajsonrpc/encoding_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/yajsonrpc/frame_test.py b/tests/lib/yajsonrpc/frame_test.py index 0fb0599699..ad8734f49c 100644 --- a/tests/lib/yajsonrpc/frame_test.py +++ b/tests/lib/yajsonrpc/frame_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/tests/lib/yajsonrpc/jsonrpcserver_test.py b/tests/lib/yajsonrpc/jsonrpcserver_test.py index 2bc70fba20..cd10d6612d 100644 --- a/tests/lib/yajsonrpc/jsonrpcserver_test.py +++ b/tests/lib/yajsonrpc/jsonrpcserver_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/yajsonrpc/parser_test.py b/tests/lib/yajsonrpc/parser_test.py index c8d865d6ae..ee90625720 100644 --- a/tests/lib/yajsonrpc/parser_test.py +++ b/tests/lib/yajsonrpc/parser_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/tests/lib/yajsonrpc/stomp_detector_test.py b/tests/lib/yajsonrpc/stomp_detector_test.py index 79ca679238..d786609d7a 100644 --- a/tests/lib/yajsonrpc/stomp_detector_test.py +++ b/tests/lib/yajsonrpc/stomp_detector_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/tests/lib/yajsonrpc/stomp_test.py b/tests/lib/yajsonrpc/stomp_test.py index 74695f3beb..cd77d2dc0c 100644 --- a/tests/lib/yajsonrpc/stomp_test.py +++ b/tests/lib/yajsonrpc/stomp_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/yajsonrpc/stompasyncdispatcher_test.py b/tests/lib/yajsonrpc/stompasyncdispatcher_test.py index 218983e8e0..959312ad7c 100644 --- a/tests/lib/yajsonrpc/stompasyncdispatcher_test.py +++ b/tests/lib/yajsonrpc/stompasyncdispatcher_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/lib/yajsonrpc/stomprpcclient_test.py b/tests/lib/yajsonrpc/stomprpcclient_test.py index 49045ff3cb..cd5d681e2f 100644 --- a/tests/lib/yajsonrpc/stomprpcclient_test.py +++ b/tests/lib/yajsonrpc/stomprpcclient_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/mkimage_test.py b/tests/mkimage_test.py index eb28f48828..4210772d21 100644 --- a/tests/mkimage_test.py +++ b/tests/mkimage_test.py @@ -1,24 +1,7 @@ -# -*- coding: utf-8 -*- -# # Copyright 2012 Sandro Bonazzola # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/modprobe.py b/tests/modprobe.py index eabddca57f..2fa231cc19 100644 --- a/tests/modprobe.py +++ b/tests/modprobe.py @@ -1,21 +1,7 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division import os diff --git a/tests/moduleloader_test.py b/tests/moduleloader_test.py index fb2ea8c5c9..793c51be97 100644 --- a/tests/moduleloader_test.py +++ b/tests/moduleloader_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/mom_policy_validator.py b/tests/mom_policy_validator.py index 21789409f7..865c77b3a5 100755 --- a/tests/mom_policy_validator.py +++ b/tests/mom_policy_validator.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import print_function diff --git a/tests/mom_test.py b/tests/mom_test.py index e22eb6bc25..eddc0aa2f2 100644 --- a/tests/mom_test.py +++ b/tests/mom_test.py @@ -1,21 +1,7 @@ -# # Copyright (C) 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/mompolicy_test.py b/tests/mompolicy_test.py index bf808a18c6..196c482fc7 100644 --- a/tests/mompolicy_test.py +++ b/tests/mompolicy_test.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/monkeypatch.py b/tests/monkeypatch.py index ac9451ae6a..9bfc90d4de 100644 --- a/tests/monkeypatch.py +++ b/tests/monkeypatch.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/monkeypatch_test.py b/tests/monkeypatch_test.py index 0ff375a54d..244afa87fa 100644 --- a/tests/monkeypatch_test.py +++ b/tests/monkeypatch_test.py @@ -1,22 +1,6 @@ -# # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/__init__.py b/tests/network/__init__.py index b8adb46e38..fd18b96f6f 100644 --- a/tests/network/__init__.py +++ b/tests/network/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/conftest.py b/tests/network/conftest.py index 2e33a91235..67399d0d44 100644 --- a/tests/network/conftest.py +++ b/tests/network/conftest.py @@ -1,20 +1,6 @@ # Copyright 2019-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/dhcp.py b/tests/network/dhcp.py index e489342047..067865fa9e 100644 --- a/tests/network/dhcp.py +++ b/tests/network/dhcp.py @@ -1,21 +1,6 @@ # Copyright 2013-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/firewall.py b/tests/network/firewall.py index 27f6f9fb51..d8d293a853 100644 --- a/tests/network/firewall.py +++ b/tests/network/firewall.py @@ -1,21 +1,6 @@ -# # Copyright 2013-2019 Red Hat, Inc. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/functional/__init__.py b/tests/network/functional/__init__.py index 51ede27f7f..19095caac6 100644 --- a/tests/network/functional/__init__.py +++ b/tests/network/functional/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/bond_basic_test.py b/tests/network/functional/bond_basic_test.py index 7630383cee..57e60fac96 100644 --- a/tests/network/functional/bond_basic_test.py +++ b/tests/network/functional/bond_basic_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/bridge_test.py b/tests/network/functional/bridge_test.py index 2626b523ed..18e6ce7f33 100644 --- a/tests/network/functional/bridge_test.py +++ b/tests/network/functional/bridge_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from contextlib import contextmanager diff --git a/tests/network/functional/conftest.py b/tests/network/functional/conftest.py index e39e8df77f..e65698b7b7 100644 --- a/tests/network/functional/conftest.py +++ b/tests/network/functional/conftest.py @@ -1,22 +1,6 @@ -# # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from contextlib import contextmanager from unittest import mock diff --git a/tests/network/functional/dns_test.py b/tests/network/functional/dns_test.py index 9eefe2700b..b1b811f17e 100644 --- a/tests/network/functional/dns_test.py +++ b/tests/network/functional/dns_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network.errors import ERR_BAD_PARAMS diff --git a/tests/network/functional/dynamic_ip_test.py b/tests/network/functional/dynamic_ip_test.py index 2d0378e6ef..d2b969dff4 100644 --- a/tests/network/functional/dynamic_ip_test.py +++ b/tests/network/functional/dynamic_ip_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from contextlib import contextmanager diff --git a/tests/network/functional/hook_test.py b/tests/network/functional/hook_test.py index 7af392d0e9..57e27319e7 100644 --- a/tests/network/functional/hook_test.py +++ b/tests/network/functional/hook_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import contextlib import json diff --git a/tests/network/functional/link_mtu_test.py b/tests/network/functional/link_mtu_test.py index 19a44ff052..d3cc8187cb 100644 --- a/tests/network/functional/link_mtu_test.py +++ b/tests/network/functional/link_mtu_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/net_basic_test.py b/tests/network/functional/net_basic_test.py index 9387bc5c8e..f8601d9362 100644 --- a/tests/network/functional/net_basic_test.py +++ b/tests/network/functional/net_basic_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/net_qos_test.py b/tests/network/functional/net_qos_test.py index e09ad66e4d..caf66eaf35 100644 --- a/tests/network/functional/net_qos_test.py +++ b/tests/network/functional/net_qos_test.py @@ -1,21 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/net_with_bond_test.py b/tests/network/functional/net_with_bond_test.py index 48c1249d14..01c8b7960c 100644 --- a/tests/network/functional/net_with_bond_test.py +++ b/tests/network/functional/net_with_bond_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/netfunctestlib.py b/tests/network/functional/netfunctestlib.py index c6476e3ae6..035fd0a9dd 100644 --- a/tests/network/functional/netfunctestlib.py +++ b/tests/network/functional/netfunctestlib.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from contextlib import contextmanager from copy import deepcopy diff --git a/tests/network/functional/netrestore_test.py b/tests/network/functional/netrestore_test.py index 9615191b9f..767a91bbbb 100644 --- a/tests/network/functional/netrestore_test.py +++ b/tests/network/functional/netrestore_test.py @@ -1,20 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/rollback_test.py b/tests/network/functional/rollback_test.py index 90db4eb81f..aeb5575f80 100644 --- a/tests/network/functional/rollback_test.py +++ b/tests/network/functional/rollback_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/static_ip_test.py b/tests/network/functional/static_ip_test.py index 0c782e2689..d23aa9ae4a 100644 --- a/tests/network/functional/static_ip_test.py +++ b/tests/network/functional/static_ip_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/stats_test.py b/tests/network/functional/stats_test.py index 5e23bd29b7..9348e812d7 100644 --- a/tests/network/functional/stats_test.py +++ b/tests/network/functional/stats_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/functional/switch_type_change_test.py b/tests/network/functional/switch_type_change_test.py index dfb7113a4c..6f7818a6c0 100644 --- a/tests/network/functional/switch_type_change_test.py +++ b/tests/network/functional/switch_type_change_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from copy import deepcopy diff --git a/tests/network/integration/__init__.py b/tests/network/integration/__init__.py index a4065adb18..50799cba6d 100644 --- a/tests/network/integration/__init__.py +++ b/tests/network/integration/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/integration/cmd_test.py b/tests/network/integration/cmd_test.py index a8f70d5dc8..659bd8b256 100644 --- a/tests/network/integration/cmd_test.py +++ b/tests/network/integration/cmd_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network import cmd diff --git a/tests/network/integration/conftest.py b/tests/network/integration/conftest.py index d7090d1b06..705bff9b01 100644 --- a/tests/network/integration/conftest.py +++ b/tests/network/integration/conftest.py @@ -1,20 +1,6 @@ # Copyright 2018-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/integration/dhcp_monitor_test.py b/tests/network/integration/dhcp_monitor_test.py index 953e4e8a80..1c0997ea16 100644 --- a/tests/network/integration/dhcp_monitor_test.py +++ b/tests/network/integration/dhcp_monitor_test.py @@ -1,21 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from contextlib import contextmanager from unittest import mock diff --git a/tests/network/integration/dns_test.py b/tests/network/integration/dns_test.py index faaf60aa18..3dfb4a2070 100644 --- a/tests/network/integration/dns_test.py +++ b/tests/network/integration/dns_test.py @@ -1,21 +1,6 @@ # Copyright 2018-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/integration/ethtool_test.py b/tests/network/integration/ethtool_test.py index 043897c0d5..84e9f6c2d3 100644 --- a/tests/network/integration/ethtool_test.py +++ b/tests/network/integration/ethtool_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/integration/iperf.py b/tests/network/integration/iperf.py index 1931b3dddc..60d4f29274 100644 --- a/tests/network/integration/iperf.py +++ b/tests/network/integration/iperf.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/integration/ipwrapper_test.py b/tests/network/integration/ipwrapper_test.py index 2c631ad9ba..50c05ce497 100644 --- a/tests/network/integration/ipwrapper_test.py +++ b/tests/network/integration/ipwrapper_test.py @@ -1,22 +1,6 @@ # Copyright 2013-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/integration/link_bond_test.py b/tests/network/integration/link_bond_test.py index 991928bee1..36b44ece5a 100644 --- a/tests/network/integration/link_bond_test.py +++ b/tests/network/integration/link_bond_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import errno import os diff --git a/tests/network/integration/link_bridge_test.py b/tests/network/integration/link_bridge_test.py index f1a5064919..02bb9351b8 100644 --- a/tests/network/integration/link_bridge_test.py +++ b/tests/network/integration/link_bridge_test.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/integration/link_iface_test.py b/tests/network/integration/link_iface_test.py index 5e00dd610f..01e65672c6 100644 --- a/tests/network/integration/link_iface_test.py +++ b/tests/network/integration/link_iface_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/integration/link_stats_test.py b/tests/network/integration/link_stats_test.py index 69515997b1..b8da23916d 100644 --- a/tests/network/integration/link_stats_test.py +++ b/tests/network/integration/link_stats_test.py @@ -1,21 +1,7 @@ # Copyright 2019-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/network/integration/lldpad_test.py b/tests/network/integration/lldpad_test.py index d423a3b1c2..a77bdd4fcf 100644 --- a/tests/network/integration/lldpad_test.py +++ b/tests/network/integration/lldpad_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/integration/netinfo_test.py b/tests/network/integration/netinfo_test.py index 3b6f4ebd85..72c252fad0 100644 --- a/tests/network/integration/netinfo_test.py +++ b/tests/network/integration/netinfo_test.py @@ -1,23 +1,6 @@ -# # Copyright 2012-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import ipaddress from unittest import mock diff --git a/tests/network/integration/netintegtestlib.py b/tests/network/integration/netintegtestlib.py index aa4bc21c13..526adfcf10 100644 --- a/tests/network/integration/netintegtestlib.py +++ b/tests/network/integration/netintegtestlib.py @@ -1,22 +1,6 @@ -# # Copyright 2019-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from contextlib import contextmanager diff --git a/tests/network/integration/netlink_test.py b/tests/network/integration/netlink_test.py index 2062ed996d..8e2065715a 100644 --- a/tests/network/integration/netlink_test.py +++ b/tests/network/integration/netlink_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/integration/tc_test.py b/tests/network/integration/tc_test.py index 302e21ccbf..1d727a3d54 100644 --- a/tests/network/integration/tc_test.py +++ b/tests/network/integration/tc_test.py @@ -1,23 +1,7 @@ -# # Copyright 2012 Roman Fenkhuber. # Copyright 2012-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from binascii import unhexlify from collections import namedtuple diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py index 8a42f0d941..41486c5dd4 100644 --- a/tests/network/nettestlib.py +++ b/tests/network/nettestlib.py @@ -1,21 +1,6 @@ # Copyright 2015-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/static/config.py b/tests/network/static/config.py index 5f77e764c1..06ba84f3fa 100644 --- a/tests/network/static/config.py +++ b/tests/network/static/config.py @@ -1,22 +1,7 @@ -# # Copyright 2011-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ This module creates vdsm configuration from a default vdsm configuration file under /etc/vdsm/vdsm.conf. It reads conf files from drop-in dirs and updates diff --git a/tests/network/static/constants.py b/tests/network/static/constants.py index b49b228db4..fbbce20aef 100644 --- a/tests/network/static/constants.py +++ b/tests/network/static/constants.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later P_VDSM = '/usr/share/vdsm/' P_VDSM_HOOKS = '/usr/libexec/vdsm/hooks/' diff --git a/tests/network/static/dsaversion.py b/tests/network/static/dsaversion.py index 197c736dbf..baba3796ff 100644 --- a/tests/network/static/dsaversion.py +++ b/tests/network/static/dsaversion.py @@ -1,22 +1,7 @@ -# # Copyright 2007-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ This module provides DSA software versioning information for python based components diff --git a/tests/network/unit/__init__.py b/tests/network/unit/__init__.py index a4065adb18..50799cba6d 100644 --- a/tests/network/unit/__init__.py +++ b/tests/network/unit/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/canonicalize_test.py b/tests/network/unit/canonicalize_test.py index e52e73c1c1..adac2b9b95 100644 --- a/tests/network/unit/canonicalize_test.py +++ b/tests/network/unit/canonicalize_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/conf_persistence_test.py b/tests/network/unit/conf_persistence_test.py index 3248c70991..bf3404112a 100644 --- a/tests/network/unit/conf_persistence_test.py +++ b/tests/network/unit/conf_persistence_test.py @@ -1,22 +1,6 @@ -# # Copyright 2013-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/config_network_test.py b/tests/network/unit/config_network_test.py index c9089636a8..3db0f5992f 100644 --- a/tests/network/unit/config_network_test.py +++ b/tests/network/unit/config_network_test.py @@ -1,24 +1,7 @@ -# # Copyright 2012 IBM, Inc. # Copyright 2012-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/connectivity_test.py b/tests/network/unit/connectivity_test.py index a51f3f3c2a..e38ca969c4 100644 --- a/tests/network/unit/connectivity_test.py +++ b/tests/network/unit/connectivity_test.py @@ -1,23 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/dns_test.py b/tests/network/unit/dns_test.py index 9ad26e4de0..257c33e026 100644 --- a/tests/network/unit/dns_test.py +++ b/tests/network/unit/dns_test.py @@ -1,21 +1,6 @@ # Copyright 2018-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/driverloader_test.py b/tests/network/unit/driverloader_test.py index 131bda2388..ec9be179e0 100644 --- a/tests/network/unit/driverloader_test.py +++ b/tests/network/unit/driverloader_test.py @@ -1,20 +1,6 @@ # Copyright 2017-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/ip_address_test.py b/tests/network/unit/ip_address_test.py index 4d58a26b3c..1908d0bcdb 100644 --- a/tests/network/unit/ip_address_test.py +++ b/tests/network/unit/ip_address_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/ip_validator_test.py b/tests/network/unit/ip_validator_test.py index 81827da266..ad9b415f36 100644 --- a/tests/network/unit/ip_validator_test.py +++ b/tests/network/unit/ip_validator_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/ipwrapper_test.py b/tests/network/unit/ipwrapper_test.py index 8528f65999..61692c2a07 100644 --- a/tests/network/unit/ipwrapper_test.py +++ b/tests/network/unit/ipwrapper_test.py @@ -1,22 +1,6 @@ # Copyright 2013-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/link_setup_test.py b/tests/network/unit/link_setup_test.py index 3197c3cd6f..49b5f82a4b 100644 --- a/tests/network/unit/link_setup_test.py +++ b/tests/network/unit/link_setup_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/link_validator_test.py b/tests/network/unit/link_validator_test.py index d2eef4852c..c59debfb2e 100644 --- a/tests/network/unit/link_validator_test.py +++ b/tests/network/unit/link_validator_test.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/lldpad_test.py b/tests/network/unit/lldpad_test.py index 3ded448f91..f3a45957d4 100644 --- a/tests/network/unit/lldpad_test.py +++ b/tests/network/unit/lldpad_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/netinfo_test.py b/tests/network/unit/netinfo_test.py index 5869d46531..a20976019b 100644 --- a/tests/network/unit/netinfo_test.py +++ b/tests/network/unit/netinfo_test.py @@ -1,23 +1,6 @@ -# # Copyright 2012-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/netswitch_test.py b/tests/network/unit/netswitch_test.py index ed70c88f85..4301711ac7 100644 --- a/tests/network/unit/netswitch_test.py +++ b/tests/network/unit/netswitch_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/netswitch_validator_test.py b/tests/network/unit/netswitch_validator_test.py index 7e7c68d40f..1319e861a8 100644 --- a/tests/network/unit/netswitch_validator_test.py +++ b/tests/network/unit/netswitch_validator_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/nmstate/__init__.py b/tests/network/unit/nmstate/__init__.py index 5938d95d1c..f023af1c03 100644 --- a/tests/network/unit/nmstate/__init__.py +++ b/tests/network/unit/nmstate/__init__.py @@ -1,19 +1,3 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file diff --git a/tests/network/unit/nmstate/bond_test.py b/tests/network/unit/nmstate/bond_test.py index fa103b6d06..e30c40418d 100644 --- a/tests/network/unit/nmstate/bond_test.py +++ b/tests/network/unit/nmstate/bond_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network import nmstate diff --git a/tests/network/unit/nmstate/conftest.py b/tests/network/unit/nmstate/conftest.py index 9372ac1307..504be1363a 100644 --- a/tests/network/unit/nmstate/conftest.py +++ b/tests/network/unit/nmstate/conftest.py @@ -1,20 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from unittest import mock diff --git a/tests/network/unit/nmstate/linux_bridge_test.py b/tests/network/unit/nmstate/linux_bridge_test.py index a35600740f..915d7dd8d1 100644 --- a/tests/network/unit/nmstate/linux_bridge_test.py +++ b/tests/network/unit/nmstate/linux_bridge_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network import nmstate diff --git a/tests/network/unit/nmstate/ovs_bridge_test.py b/tests/network/unit/nmstate/ovs_bridge_test.py index c9cbabd404..8930a75637 100644 --- a/tests/network/unit/nmstate/ovs_bridge_test.py +++ b/tests/network/unit/nmstate/ovs_bridge_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from unittest import mock diff --git a/tests/network/unit/nmstate/source_route_test.py b/tests/network/unit/nmstate/source_route_test.py index 2e4d1e22df..5dd4208033 100644 --- a/tests/network/unit/nmstate/source_route_test.py +++ b/tests/network/unit/nmstate/source_route_test.py @@ -1,20 +1,6 @@ # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network import nmstate from vdsm.network.nmstate import route diff --git a/tests/network/unit/nmstate/sriov_test.py b/tests/network/unit/nmstate/sriov_test.py index 169a785bd6..e3e14c7dd8 100644 --- a/tests/network/unit/nmstate/sriov_test.py +++ b/tests/network/unit/nmstate/sriov_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network import nmstate from vdsm.network.nmstate import sriov diff --git a/tests/network/unit/nmstate/testlib.py b/tests/network/unit/nmstate/testlib.py index 3a88ee3918..d528ef3f05 100644 --- a/tests/network/unit/nmstate/testlib.py +++ b/tests/network/unit/nmstate/testlib.py @@ -1,22 +1,6 @@ -# # Copyright 2019-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/network/unit/nmstate/vlan_test.py b/tests/network/unit/nmstate/vlan_test.py index 30397a3fa9..c8a0d37f7e 100644 --- a/tests/network/unit/nmstate/vlan_test.py +++ b/tests/network/unit/nmstate/vlan_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from vdsm.network import nmstate diff --git a/tests/network/unit/qos_test.py b/tests/network/unit/qos_test.py index fee6600e21..aaf3cfad08 100644 --- a/tests/network/unit/qos_test.py +++ b/tests/network/unit/qos_test.py @@ -1,21 +1,6 @@ # Copyright 2014-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/sriov_test.py b/tests/network/unit/sriov_test.py index 7185c23f80..9748c349e0 100644 --- a/tests/network/unit/sriov_test.py +++ b/tests/network/unit/sriov_test.py @@ -1,21 +1,6 @@ # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/tc_test.py b/tests/network/unit/tc_test.py index 615306d9f9..cff6f672ea 100644 --- a/tests/network/unit/tc_test.py +++ b/tests/network/unit/tc_test.py @@ -1,23 +1,7 @@ -# # Copyright 2012 Roman Fenkhuber. # Copyright 2012-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/network/unit/testlib.py b/tests/network/unit/testlib.py index 4b1eeee3e4..c175371a6c 100644 --- a/tests/network/unit/testlib.py +++ b/tests/network/unit/testlib.py @@ -1,22 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later class NetInfo(object): DEFAULT_STP = 'off' diff --git a/tests/osutils_test.py b/tests/osutils_test.py index 66c1a27e68..1c7d09a9e9 100644 --- a/tests/osutils_test.py +++ b/tests/osutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/panic_helper.py b/tests/panic_helper.py index 9b488bb958..f558784aae 100644 --- a/tests/panic_helper.py +++ b/tests/panic_helper.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division import os diff --git a/tests/passwords_test.py b/tests/passwords_test.py index d05665476c..c0a5c37765 100644 --- a/tests/passwords_test.py +++ b/tests/passwords_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/permutation_test.py b/tests/permutation_test.py index 88e584552a..b52fb62d6d 100644 --- a/tests/permutation_test.py +++ b/tests/permutation_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/prlimit_test.py b/tests/prlimit_test.py index 4bae4fbbde..f3f6764e2a 100644 --- a/tests/prlimit_test.py +++ b/tests/prlimit_test.py @@ -1,22 +1,6 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/pywatch_test.py b/tests/pywatch_test.py index cab9dede5c..78cd0a52e3 100644 --- a/tests/pywatch_test.py +++ b/tests/pywatch_test.py @@ -1,22 +1,7 @@ # Copyright 2018-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/response_test.py b/tests/response_test.py index a48365d934..55ea268b42 100644 --- a/tests/response_test.py +++ b/tests/response_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/rngsources_test.py b/tests/rngsources_test.py index 3a5f5839ca..7c5f9c5950 100644 --- a/tests/rngsources_test.py +++ b/tests/rngsources_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/schedule_test.py b/tests/schedule_test.py index ef29e805d7..820ae40ab9 100644 --- a/tests/schedule_test.py +++ b/tests/schedule_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/schemavalidation_test.py b/tests/schemavalidation_test.py index e142ce3d6e..4826f58b05 100644 --- a/tests/schemavalidation_test.py +++ b/tests/schemavalidation_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/sigutils_test.py b/tests/sigutils_test.py index 04a4736d20..198e568fbc 100644 --- a/tests/sigutils_test.py +++ b/tests/sigutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/ssl_test.py b/tests/ssl_test.py index eea615b760..eec84f680d 100644 --- a/tests/ssl_test.py +++ b/tests/ssl_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/statsd_test.py b/tests/statsd_test.py index c2610b6aa4..c95efe3ae3 100644 --- a/tests/statsd_test.py +++ b/tests/statsd_test.py @@ -1,23 +1,6 @@ -# coding=utf-8 -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/stomp_test_utils.py b/tests/stomp_test_utils.py index c65ca72618..968e16fcfa 100644 --- a/tests/stomp_test_utils.py +++ b/tests/stomp_test_utils.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/stompadapter_test.py b/tests/stompadapter_test.py index bad845412a..8f2c08baf1 100644 --- a/tests/stompadapter_test.py +++ b/tests/stompadapter_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/stompasyncclient_test.py b/tests/stompasyncclient_test.py index 5a3195c8e5..ee42118880 100644 --- a/tests/stompasyncclient_test.py +++ b/tests/stompasyncclient_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index c758a9f310..d5c835a05b 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -1,23 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/asyncevent_test.py b/tests/storage/asyncevent_test.py index e3aff9c489..5772987d72 100644 --- a/tests/storage/asyncevent_test.py +++ b/tests/storage/asyncevent_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/asyncutils_test.py b/tests/storage/asyncutils_test.py index 41ae387c4a..6d474776c5 100644 --- a/tests/storage/asyncutils_test.py +++ b/tests/storage/asyncutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/backends_test.py b/tests/storage/backends_test.py index c8af277d1a..7462d0aee8 100644 --- a/tests/storage/backends_test.py +++ b/tests/storage/backends_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/bitmaps_test.py b/tests/storage/bitmaps_test.py index 5e674c2d3e..ac6da8603f 100644 --- a/tests/storage/bitmaps_test.py +++ b/tests/storage/bitmaps_test.py @@ -1,21 +1,6 @@ # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import os diff --git a/tests/storage/blkdiscard_test.py b/tests/storage/blkdiscard_test.py index 2b2181b614..e4f71b45f7 100644 --- a/tests/storage/blkdiscard_test.py +++ b/tests/storage/blkdiscard_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/blockdev_test.py b/tests/storage/blockdev_test.py index 4afee7f6ae..16bcebcd03 100644 --- a/tests/storage/blockdev_test.py +++ b/tests/storage/blockdev_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/blocksd_test.py b/tests/storage/blocksd_test.py index 6de1179053..d3b9e2a742 100644 --- a/tests/storage/blocksd_test.py +++ b/tests/storage/blocksd_test.py @@ -1,23 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/blockvolume_test.py b/tests/storage/blockvolume_test.py index fc8b7253d2..9d3245075b 100644 --- a/tests/storage/blockvolume_test.py +++ b/tests/storage/blockvolume_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/check_test.py b/tests/storage/check_test.py index 14364b2987..e889784d4b 100644 --- a/tests/storage/check_test.py +++ b/tests/storage/check_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/cleanup.py b/tests/storage/cleanup.py index c01ce1a4c8..a7423d82b6 100644 --- a/tests/storage/cleanup.py +++ b/tests/storage/cleanup.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/clusterlock_test.py b/tests/storage/clusterlock_test.py index e889a230c9..b9f28bd59c 100644 --- a/tests/storage/clusterlock_test.py +++ b/tests/storage/clusterlock_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py index c8078fd1be..5894c1313e 100644 --- a/tests/storage/conftest.py +++ b/tests/storage/conftest.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Common fixtures that can be used without importing anything. diff --git a/tests/storage/constants.py b/tests/storage/constants.py index 9ee064f8bf..afe7e84e5b 100644 --- a/tests/storage/constants.py +++ b/tests/storage/constants.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/curlimgwrap_test.py b/tests/storage/curlimgwrap_test.py index e504845b20..d7050ddc4c 100644 --- a/tests/storage/curlimgwrap_test.py +++ b/tests/storage/curlimgwrap_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/devicemapper_test.py b/tests/storage/devicemapper_test.py index 9c85ebbf41..f3f7d9f1a5 100644 --- a/tests/storage/devicemapper_test.py +++ b/tests/storage/devicemapper_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/directio_test.py b/tests/storage/directio_test.py index 9f525c2afc..bc99bb5661 100644 --- a/tests/storage/directio_test.py +++ b/tests/storage/directio_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/dmsetup_test.py b/tests/storage/dmsetup_test.py index 3564e8ea00..38f6dbfc99 100644 --- a/tests/storage/dmsetup_test.py +++ b/tests/storage/dmsetup_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/exception_test.py b/tests/storage/exception_test.py index 883902ce6a..55f48d164d 100644 --- a/tests/storage/exception_test.py +++ b/tests/storage/exception_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/fake_os_brick/os_brick/__init__.py b/tests/storage/fake_os_brick/os_brick/__init__.py index e69de29bb2..7cec2738df 100644 --- a/tests/storage/fake_os_brick/os_brick/__init__.py +++ b/tests/storage/fake_os_brick/os_brick/__init__.py @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file diff --git a/tests/storage/fake_os_brick/os_brick/initiator/__init__.py b/tests/storage/fake_os_brick/os_brick/initiator/__init__.py index e69de29bb2..7cec2738df 100644 --- a/tests/storage/fake_os_brick/os_brick/initiator/__init__.py +++ b/tests/storage/fake_os_brick/os_brick/initiator/__init__.py @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file diff --git a/tests/storage/fake_os_brick/os_brick/initiator/connector.py b/tests/storage/fake_os_brick/os_brick/initiator/connector.py index 1884e2f35f..981cc37a74 100644 --- a/tests/storage/fake_os_brick/os_brick/initiator/connector.py +++ b/tests/storage/fake_os_brick/os_brick/initiator/connector.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/fakelib_test.py b/tests/storage/fakelib_test.py index ca2042b0b8..53fbab694e 100644 --- a/tests/storage/fakelib_test.py +++ b/tests/storage/fakelib_test.py @@ -1,21 +1,6 @@ # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/fakesanlock.py b/tests/storage/fakesanlock.py index 8752792dca..8ece39a551 100644 --- a/tests/storage/fakesanlock.py +++ b/tests/storage/fakesanlock.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/fakesanlock_test.py b/tests/storage/fakesanlock_test.py index 7543c315dc..843a8c0a7a 100644 --- a/tests/storage/fakesanlock_test.py +++ b/tests/storage/fakesanlock_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/fallocate_test.py b/tests/storage/fallocate_test.py index b8f1775cd0..672a3ebd33 100644 --- a/tests/storage/fallocate_test.py +++ b/tests/storage/fallocate_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/filesd_metadata_test.py b/tests/storage/filesd_metadata_test.py index aa21ceb3b9..64da15c942 100644 --- a/tests/storage/filesd_metadata_test.py +++ b/tests/storage/filesd_metadata_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/filesd_test.py b/tests/storage/filesd_test.py index c4aad94405..d9e22c269b 100644 --- a/tests/storage/filesd_test.py +++ b/tests/storage/filesd_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/fileutil_test.py b/tests/storage/fileutil_test.py index ed120a6f48..3bd821a321 100644 --- a/tests/storage/fileutil_test.py +++ b/tests/storage/fileutil_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/filevolume_test.py b/tests/storage/filevolume_test.py index c41bc16bd7..3572823589 100644 --- a/tests/storage/filevolume_test.py +++ b/tests/storage/filevolume_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/formatconverter_test.py b/tests/storage/formatconverter_test.py index 9a645d586b..1fe3a2b740 100644 --- a/tests/storage/formatconverter_test.py +++ b/tests/storage/formatconverter_test.py @@ -1,22 +1,6 @@ -# # Copyright 2018-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/tests/storage/glance_test.py b/tests/storage/glance_test.py index 8c89b36617..5261b3bc52 100644 --- a/tests/storage/glance_test.py +++ b/tests/storage/glance_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Tests for glance module. diff --git a/tests/storage/glustervolume_test.py b/tests/storage/glustervolume_test.py index 7bc8e6bfe2..7b3639e83e 100644 --- a/tests/storage/glustervolume_test.py +++ b/tests/storage/glustervolume_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/guarded_test.py b/tests/storage/guarded_test.py index bc2e76e2f3..2510e91eb2 100644 --- a/tests/storage/guarded_test.py +++ b/tests/storage/guarded_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/hsm_connect_test.py b/tests/storage/hsm_connect_test.py index 9711a22797..1e645211c8 100644 --- a/tests/storage/hsm_connect_test.py +++ b/tests/storage/hsm_connect_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/hsm_test.py b/tests/storage/hsm_test.py index aad757f479..b395239626 100644 --- a/tests/storage/hsm_test.py +++ b/tests/storage/hsm_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/image_test.py b/tests/storage/image_test.py index 3937f30f63..82ddb98063 100644 --- a/tests/storage/image_test.py +++ b/tests/storage/image_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/imagetickets_test.py b/tests/storage/imagetickets_test.py index 76a6ea9453..1bfc288fa4 100644 --- a/tests/storage/imagetickets_test.py +++ b/tests/storage/imagetickets_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import http.client import json diff --git a/tests/storage/iscsi_test.py b/tests/storage/iscsi_test.py index 7a44347482..ea09abd08e 100644 --- a/tests/storage/iscsi_test.py +++ b/tests/storage/iscsi_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/iscsiadm_test.py b/tests/storage/iscsiadm_test.py index 849361c3b7..a6a815ca3f 100644 --- a/tests/storage/iscsiadm_test.py +++ b/tests/storage/iscsiadm_test.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/localfssd_test.py b/tests/storage/localfssd_test.py index ae9a206fac..f364b910c2 100644 --- a/tests/storage/localfssd_test.py +++ b/tests/storage/localfssd_test.py @@ -1,23 +1,6 @@ -# # Copyright 2014-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/loopback.py b/tests/storage/loopback.py index 97e67c2d77..a2cd8a6527 100644 --- a/tests/storage/loopback.py +++ b/tests/storage/loopback.py @@ -1,23 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/loopback_test.py b/tests/storage/loopback_test.py index 85d47af4b5..64c0f5a9e6 100644 --- a/tests/storage/loopback_test.py +++ b/tests/storage/loopback_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/lsof_test.py b/tests/storage/lsof_test.py index 7ffce9a6bd..4788dcd0d4 100644 --- a/tests/storage/lsof_test.py +++ b/tests/storage/lsof_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import os import pwd diff --git a/tests/storage/lvm_test.py b/tests/storage/lvm_test.py index 33c05a367f..ad66ae9045 100644 --- a/tests/storage/lvm_test.py +++ b/tests/storage/lvm_test.py @@ -1,23 +1,6 @@ -# # Copyright 2012-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/lvmconf_test.py b/tests/storage/lvmconf_test.py index 2bf884fad7..d5964361f6 100644 --- a/tests/storage/lvmconf_test.py +++ b/tests/storage/lvmconf_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/lvmfilter_test.py b/tests/storage/lvmfilter_test.py index f03de9a49e..404dab4093 100644 --- a/tests/storage/lvmfilter_test.py +++ b/tests/storage/lvmfilter_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/mailbox_test.py b/tests/storage/mailbox_test.py index 237eb55824..79558fa931 100644 --- a/tests/storage/mailbox_test.py +++ b/tests/storage/mailbox_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/managedvolume_test.py b/tests/storage/managedvolume_test.py index efb3fb69d2..1818a6408c 100644 --- a/tests/storage/managedvolume_test.py +++ b/tests/storage/managedvolume_test.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/managedvolumedb_test.py b/tests/storage/managedvolumedb_test.py index 3da4704bae..363dd284e7 100644 --- a/tests/storage/managedvolumedb_test.py +++ b/tests/storage/managedvolumedb_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/marks.py b/tests/storage/marks.py index 9f3c574675..e74fd5b1a4 100644 --- a/tests/storage/marks.py +++ b/tests/storage/marks.py @@ -1,23 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/merge_test.py b/tests/storage/merge_test.py index 74755db814..de090f5718 100644 --- a/tests/storage/merge_test.py +++ b/tests/storage/merge_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/misc_test.py b/tests/storage/misc_test.py index 2fd88a8bd5..48e29c4eb3 100644 --- a/tests/storage/misc_test.py +++ b/tests/storage/misc_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/monitor_test.py b/tests/storage/monitor_test.py index 100391fa57..263f3744ce 100644 --- a/tests/storage/monitor_test.py +++ b/tests/storage/monitor_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/mount_test.py b/tests/storage/mount_test.py index ab1bd78cf1..e2147fca94 100644 --- a/tests/storage/mount_test.py +++ b/tests/storage/mount_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/mpathconf_test.py b/tests/storage/mpathconf_test.py index 8d1afbd82d..241fca058a 100644 --- a/tests/storage/mpathconf_test.py +++ b/tests/storage/mpathconf_test.py @@ -1,23 +1,7 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + import io import pytest diff --git a/tests/storage/mpathhealth_monitor_test.py b/tests/storage/mpathhealth_monitor_test.py index 145a86db07..c8be1c358a 100644 --- a/tests/storage/mpathhealth_monitor_test.py +++ b/tests/storage/mpathhealth_monitor_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/multipath_test.py b/tests/storage/multipath_test.py index 2867ca07c5..288373e010 100644 --- a/tests/storage/multipath_test.py +++ b/tests/storage/multipath_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/nbd_test.py b/tests/storage/nbd_test.py index 530657fe54..699938d4af 100644 --- a/tests/storage/nbd_test.py +++ b/tests/storage/nbd_test.py @@ -1,22 +1,7 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ To run this test you must run the tests as root, or have writable /run/vdsm and running supervdsm serving the user running the tests. diff --git a/tests/storage/nbdutils_test.py b/tests/storage/nbdutils_test.py index 76d534f292..f6341bdd2e 100644 --- a/tests/storage/nbdutils_test.py +++ b/tests/storage/nbdutils_test.py @@ -1,21 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/nfssd_test.py b/tests/storage/nfssd_test.py index f8e7161afe..26e052aeac 100644 --- a/tests/storage/nfssd_test.py +++ b/tests/storage/nfssd_test.py @@ -1,23 +1,6 @@ -# # Copyright 2014-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/operation_test.py b/tests/storage/operation_test.py index be3f6d2a2c..688097864a 100644 --- a/tests/storage/operation_test.py +++ b/tests/storage/operation_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/outofprocess_test.py b/tests/storage/outofprocess_test.py index 70ad7dce01..b08e4096b2 100644 --- a/tests/storage/outofprocess_test.py +++ b/tests/storage/outofprocess_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/persistent_test.py b/tests/storage/persistent_test.py index 1b278a5fba..d35729908e 100644 --- a/tests/storage/persistent_test.py +++ b/tests/storage/persistent_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/qemuimg_test.py b/tests/storage/qemuimg_test.py index f28f6d2fa5..89740ed608 100644 --- a/tests/storage/qemuimg_test.py +++ b/tests/storage/qemuimg_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/qemuio.py b/tests/storage/qemuio.py index 9e01735da2..74b17287f2 100644 --- a/tests/storage/qemuio.py +++ b/tests/storage/qemuio.py @@ -1,21 +1,6 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ qemuio - wrapper for qemu-io tool diff --git a/tests/storage/qemuio_test.py b/tests/storage/qemuio_test.py index 1426db3de3..b6a7873f09 100644 --- a/tests/storage/qemuio_test.py +++ b/tests/storage/qemuio_test.py @@ -1,21 +1,6 @@ # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/resourcemanager_test.py b/tests/storage/resourcemanager_test.py index 8a449c69ec..c40d629fc6 100644 --- a/tests/storage/resourcemanager_test.py +++ b/tests/storage/resourcemanager_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/rwlock_test.py b/tests/storage/rwlock_test.py index 91f7591fd2..e5b1263f8b 100644 --- a/tests/storage/rwlock_test.py +++ b/tests/storage/rwlock_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/sanlock_direct_test.py b/tests/storage/sanlock_direct_test.py index 0bf48db9c1..85f249c7fc 100644 --- a/tests/storage/sanlock_direct_test.py +++ b/tests/storage/sanlock_direct_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from collections import namedtuple diff --git a/tests/storage/sanlockconf_test.py b/tests/storage/sanlockconf_test.py index 2389a05d0e..0bd7f69735 100644 --- a/tests/storage/sanlockconf_test.py +++ b/tests/storage/sanlockconf_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/storage/sd_manifest_test.py b/tests/storage/sd_manifest_test.py index 82e27c17a1..9fb5a42f4d 100644 --- a/tests/storage/sd_manifest_test.py +++ b/tests/storage/sd_manifest_test.py @@ -1,21 +1,6 @@ # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/sd_test.py b/tests/storage/sd_test.py index a7baa8821c..83f12b4c51 100644 --- a/tests/storage/sd_test.py +++ b/tests/storage/sd_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/tests/storage/sdm_add_bitmap_test.py b/tests/storage/sdm_add_bitmap_test.py index b267f71348..5eef3dc2b1 100644 --- a/tests/storage/sdm_add_bitmap_test.py +++ b/tests/storage/sdm_add_bitmap_test.py @@ -1,22 +1,7 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from contextlib import contextmanager import pytest diff --git a/tests/storage/sdm_amend_volume_test.py b/tests/storage/sdm_amend_volume_test.py index 88cce5debc..0bcc5aa356 100644 --- a/tests/storage/sdm_amend_volume_test.py +++ b/tests/storage/sdm_amend_volume_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/sdm_clear_bitmaps_test.py b/tests/storage/sdm_clear_bitmaps_test.py index 8fa758279b..a563a27929 100644 --- a/tests/storage/sdm_clear_bitmaps_test.py +++ b/tests/storage/sdm_clear_bitmaps_test.py @@ -1,22 +1,7 @@ -# # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from contextlib import contextmanager import pytest diff --git a/tests/storage/sdm_copy_data_test.py b/tests/storage/sdm_copy_data_test.py index 50b3cfbf03..e03be7d6a4 100644 --- a/tests/storage/sdm_copy_data_test.py +++ b/tests/storage/sdm_copy_data_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/sdm_indirection_test.py b/tests/storage/sdm_indirection_test.py index 61fc2be86a..d2f0ac6277 100644 --- a/tests/storage/sdm_indirection_test.py +++ b/tests/storage/sdm_indirection_test.py @@ -1,21 +1,6 @@ # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/sdm_merge_test.py b/tests/storage/sdm_merge_test.py index e2b808d1a4..9c333f65f5 100644 --- a/tests/storage/sdm_merge_test.py +++ b/tests/storage/sdm_merge_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/sdm_remove_bitmap_test.py b/tests/storage/sdm_remove_bitmap_test.py index 4a84972230..af6ed1a272 100644 --- a/tests/storage/sdm_remove_bitmap_test.py +++ b/tests/storage/sdm_remove_bitmap_test.py @@ -1,22 +1,7 @@ -# # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from contextlib import contextmanager import pytest diff --git a/tests/storage/sdm_update_volume_test.py b/tests/storage/sdm_update_volume_test.py index 911c2711eb..8db0b475d2 100644 --- a/tests/storage/sdm_update_volume_test.py +++ b/tests/storage/sdm_update_volume_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/securable_test.py b/tests/storage/securable_test.py index 4c46d707e2..f0ad388238 100644 --- a/tests/storage/securable_test.py +++ b/tests/storage/securable_test.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/spwd_test.py b/tests/storage/spwd_test.py index 44bc66c4fe..661665b483 100644 --- a/tests/storage/spwd_test.py +++ b/tests/storage/spwd_test.py @@ -1,22 +1,6 @@ -# # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import errno import threading diff --git a/tests/storage/storagefakelib.py b/tests/storage/storagefakelib.py index ddebcf5ca6..327d1c5a3b 100644 --- a/tests/storage/storagefakelib.py +++ b/tests/storage/storagefakelib.py @@ -1,21 +1,6 @@ # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/storageserver_nfs_test.py b/tests/storage/storageserver_nfs_test.py index 3c9ee4fc92..37a2dab8c4 100644 --- a/tests/storage/storageserver_nfs_test.py +++ b/tests/storage/storageserver_nfs_test.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/storageserver_test.py b/tests/storage/storageserver_test.py index 94604c5a40..10cde6a53b 100644 --- a/tests/storage/storageserver_test.py +++ b/tests/storage/storageserver_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/storage/storagetestlib.py b/tests/storage/storagetestlib.py index f6067a6037..347ad863b5 100644 --- a/tests/storage/storagetestlib.py +++ b/tests/storage/storagetestlib.py @@ -1,21 +1,6 @@ # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/stress/download.py b/tests/storage/stress/download.py index 5ad4ceb990..7e62355faf 100644 --- a/tests/storage/stress/download.py +++ b/tests/storage/stress/download.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Stress tests for vdsm http server. diff --git a/tests/storage/stress/extend.py b/tests/storage/stress/extend.py index 3a258eac76..f8a9407ea9 100644 --- a/tests/storage/stress/extend.py +++ b/tests/storage/stress/extend.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ This is a reproducer for https://bugzilla.redhat.com/1553133, reproducing the issue of lvm read-only like commands running on non-spm host corrupting diff --git a/tests/storage/stress/initiator.py b/tests/storage/stress/initiator.py index 44090263a3..2b674897d4 100644 --- a/tests/storage/stress/initiator.py +++ b/tests/storage/stress/initiator.py @@ -1,4 +1,8 @@ #!/usr/bin/python3 + +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ iscsiadm initiator test. Allows testing initiator setup and logins to iSCSI targets via multiple diff --git a/tests/storage/stress/release-spm-lease.py b/tests/storage/stress/release-spm-lease.py index 7261979561..3ee4fdb9f1 100644 --- a/tests/storage/stress/release-spm-lease.py +++ b/tests/storage/stress/release-spm-lease.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Release the SPM lease behind vdsm back. """ diff --git a/tests/storage/stress/reload.py b/tests/storage/stress/reload.py index c36c169faa..a6760cb605 100755 --- a/tests/storage/stress/reload.py +++ b/tests/storage/stress/reload.py @@ -1,4 +1,8 @@ #!/usr/bin/python3 + +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Reproducer for bug 1837199 diff --git a/tests/storage/stress/switch_master.py b/tests/storage/stress/switch_master.py index 77092cee7b..b17a2bc9e0 100644 --- a/tests/storage/stress/switch_master.py +++ b/tests/storage/stress/switch_master.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Stress tests for switching the master storage domain. diff --git a/tests/storage/stress/thinp.py b/tests/storage/stress/thinp.py index 762d17c608..d943d6fd45 100644 --- a/tests/storage/stress/thinp.py +++ b/tests/storage/stress/thinp.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Stress tests for thinp auto extend volume. diff --git a/tests/storage/sysfs_test.py b/tests/storage/sysfs_test.py index 9a9c458207..297810c885 100644 --- a/tests/storage/sysfs_test.py +++ b/tests/storage/sysfs_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/task_test.py b/tests/storage/task_test.py index e282e7e102..f105e22965 100644 --- a/tests/storage/task_test.py +++ b/tests/storage/task_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/taskmanager_test.py b/tests/storage/taskmanager_test.py index 75f4be0744..b56d5fb0d7 100644 --- a/tests/storage/taskmanager_test.py +++ b/tests/storage/taskmanager_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/testlib_test.py b/tests/storage/testlib_test.py index c5fcd23408..d0b4a0a5c2 100644 --- a/tests/storage/testlib_test.py +++ b/tests/storage/testlib_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/threadpool_test.py b/tests/storage/threadpool_test.py index ccd228a11b..7d9e40132b 100644 --- a/tests/storage/threadpool_test.py +++ b/tests/storage/threadpool_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/tmpfs.py b/tests/storage/tmpfs.py index b46467d755..dd2114cf83 100644 --- a/tests/storage/tmpfs.py +++ b/tests/storage/tmpfs.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/tmprepo.py b/tests/storage/tmprepo.py index 0b1aaae578..41dce55cac 100644 --- a/tests/storage/tmprepo.py +++ b/tests/storage/tmprepo.py @@ -1,21 +1,6 @@ # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/tmpstorage.py b/tests/storage/tmpstorage.py index 9f21860a2a..aec6a22738 100644 --- a/tests/storage/tmpstorage.py +++ b/tests/storage/tmpstorage.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/transientdisk_test.py b/tests/storage/transientdisk_test.py index 6482783765..8f59b6d32c 100644 --- a/tests/storage/transientdisk_test.py +++ b/tests/storage/transientdisk_test.py @@ -1,21 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/userstorage.py b/tests/storage/userstorage.py index e003d1c5d8..f3273a14c5 100644 --- a/tests/storage/userstorage.py +++ b/tests/storage/userstorage.py @@ -1,9 +1,7 @@ # Copyright (C) 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ userstorage.py - configure storage for vdsm storage tests. """ diff --git a/tests/storage/volume_metadata_test.py b/tests/storage/volume_metadata_test.py index 507303d421..404f0276ff 100644 --- a/tests/storage/volume_metadata_test.py +++ b/tests/storage/volume_metadata_test.py @@ -1,21 +1,6 @@ # Copyright 2016-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/volume_test.py b/tests/storage/volume_test.py index 90241af37d..36fafeba55 100644 --- a/tests/storage/volume_test.py +++ b/tests/storage/volume_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/workarounds_test.py b/tests/storage/workarounds_test.py index f810a3263a..a37c3edf78 100644 --- a/tests/storage/workarounds_test.py +++ b/tests/storage/workarounds_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/xlease_test.py b/tests/storage/xlease_test.py index 6cd2e0134e..9afe75f224 100644 --- a/tests/storage/xlease_test.py +++ b/tests/storage/xlease_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/sysprep_test.py b/tests/sysprep_test.py index 68c9495586..e4cfc19422 100644 --- a/tests/sysprep_test.py +++ b/tests/sysprep_test.py @@ -1,22 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/taskset_test.py b/tests/taskset_test.py index 1be9228e34..d605b2f836 100644 --- a/tests/taskset_test.py +++ b/tests/taskset_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/testValidation.py b/tests/testValidation.py index 7acb16595d..c52fc08655 100644 --- a/tests/testValidation.py +++ b/tests/testValidation.py @@ -1,22 +1,6 @@ -# # Copyright 2009-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/testing.py b/tests/testing.py index 511a37fd31..3cec148291 100644 --- a/tests/testing.py +++ b/tests/testing.py @@ -1,22 +1,7 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ testing - Testing environment helpers """ diff --git a/tests/testlib.py b/tests/testlib.py index 7b0cb0243a..71936a3935 100644 --- a/tests/testlib.py +++ b/tests/testlib.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/testlib_test.py b/tests/testlib_test.py index c6a45bc2b8..84487896a3 100644 --- a/tests/testlib_test.py +++ b/tests/testlib_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/testrunner.py b/tests/testrunner.py index cff5115940..4154523a4f 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -1,22 +1,6 @@ -# # Copyright 2012-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/tests_child.py b/tests/tests_child.py index cfe9978715..06272aa5fd 100644 --- a/tests/tests_child.py +++ b/tests/tests_child.py @@ -1,21 +1,6 @@ # Copyright 2014-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/throttledlog_test.py b/tests/throttledlog_test.py index fb74039e3f..481514aa50 100644 --- a/tests/throttledlog_test.py +++ b/tests/throttledlog_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/tool_confmeta_test.py b/tests/tool_confmeta_test.py index 74bc561f4e..e6fba14801 100644 --- a/tests/tool_confmeta_test.py +++ b/tests/tool_confmeta_test.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/tool_test.py b/tests/tool_test.py index 0653638bb1..dc928c3efa 100644 --- a/tests/tool_test.py +++ b/tests/tool_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/unixrpc_testlib.py b/tests/unixrpc_testlib.py index 4a925be435..4108402b55 100644 --- a/tests/unixrpc_testlib.py +++ b/tests/unixrpc_testlib.py @@ -1,21 +1,6 @@ -# # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/v2v_testlib.py b/tests/v2v_testlib.py index 7265283da3..6986152509 100644 --- a/tests/v2v_testlib.py +++ b/tests/v2v_testlib.py @@ -1,21 +1,6 @@ # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/validate_test.py b/tests/validate_test.py index 47aef9e667..dd699d5bc4 100644 --- a/tests/validate_test.py +++ b/tests/validate_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/vdsmapi_test.py b/tests/vdsmapi_test.py index 43b8739235..85b58a423c 100644 --- a/tests/vdsmapi_test.py +++ b/tests/vdsmapi_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/vdsmdumpchains_test.py b/tests/vdsmdumpchains_test.py index 3b54e2a00f..55d7eb8a88 100644 --- a/tests/vdsmdumpchains_test.py +++ b/tests/vdsmdumpchains_test.py @@ -1,21 +1,7 @@ # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + import pytest from vdsm.tool.dump_volume_chains import (_build_volume_chain, _BLANK_UUID, diff --git a/tests/verify.py b/tests/verify.py index 9a33a5d94d..ce4ce7ca9d 100644 --- a/tests/verify.py +++ b/tests/verify.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/__init__.py b/tests/virt/__init__.py index f2f66ee618..4157c626e9 100644 --- a/tests/virt/__init__.py +++ b/tests/virt/__init__.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/backup_test.py b/tests/virt/backup_test.py index 68414a03d3..4420c21fb5 100644 --- a/tests/virt/backup_test.py +++ b/tests/virt/backup_test.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import libvirt diff --git a/tests/virt/boot_hostdev_test.py b/tests/virt/boot_hostdev_test.py index 12d1768253..710608e2a8 100644 --- a/tests/virt/boot_hostdev_test.py +++ b/tests/virt/boot_hostdev_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/bulk_sampling_test.py b/tests/virt/bulk_sampling_test.py index 6d70699d93..c6abd86fe4 100644 --- a/tests/virt/bulk_sampling_test.py +++ b/tests/virt/bulk_sampling_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/cd_test.py b/tests/virt/cd_test.py index a9df7502ba..af7c518a6d 100644 --- a/tests/virt/cd_test.py +++ b/tests/virt/cd_test.py @@ -1,23 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging import time diff --git a/tests/virt/cpumanagement_test.py b/tests/virt/cpumanagement_test.py index 56ccd0428f..d4f379ff41 100644 --- a/tests/virt/cpumanagement_test.py +++ b/tests/virt/cpumanagement_test.py @@ -1,20 +1,6 @@ # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import os.path diff --git a/tests/virt/device_compat_test.py b/tests/virt/device_compat_test.py index 3e5e494de2..23136b1f12 100644 --- a/tests/virt/device_compat_test.py +++ b/tests/virt/device_compat_test.py @@ -1,23 +1,7 @@ -# encoding: utf-8 -# # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/device_lookup_test.py b/tests/virt/device_lookup_test.py index ffb1fdbc01..9cbb2934e3 100644 --- a/tests/virt/device_lookup_test.py +++ b/tests/virt/device_lookup_test.py @@ -1,23 +1,6 @@ -# encoding: utf-8 -# # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/device_test.py b/tests/virt/device_test.py index a5a52ed611..bd9faac52b 100644 --- a/tests/virt/device_test.py +++ b/tests/virt/device_test.py @@ -1,22 +1,6 @@ -# # Copyright 2008-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/devicexml_test.py b/tests/virt/devicexml_test.py index a7bbd728ae..42d1f32781 100644 --- a/tests/virt/devicexml_test.py +++ b/tests/virt/devicexml_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/diskreplicate_test.py b/tests/virt/diskreplicate_test.py index f868675bfc..10cc4dc966 100644 --- a/tests/virt/diskreplicate_test.py +++ b/tests/virt/diskreplicate_test.py @@ -1,22 +1,6 @@ -# # Copyright 2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/displaynetwork_test.py b/tests/virt/displaynetwork_test.py index 3627917a69..b59ec07eb9 100644 --- a/tests/virt/displaynetwork_test.py +++ b/tests/virt/displaynetwork_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/domaindescriptor_test.py b/tests/virt/domaindescriptor_test.py index 4d2f95b0e0..223f1879e5 100644 --- a/tests/virt/domaindescriptor_test.py +++ b/tests/virt/domaindescriptor_test.py @@ -1,23 +1,6 @@ -# # Copyright 2014-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/domxml_preprocess_test.py b/tests/virt/domxml_preprocess_test.py index 0a6742d53f..1880649cfe 100644 --- a/tests/virt/domxml_preprocess_test.py +++ b/tests/virt/domxml_preprocess_test.py @@ -1,23 +1,6 @@ -# # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/drivename_test.py b/tests/virt/drivename_test.py index 42ffe0b03a..aa995d9588 100644 --- a/tests/virt/drivename_test.py +++ b/tests/virt/drivename_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/events_test.py b/tests/virt/events_test.py index 59a94cae08..ef943a5bed 100644 --- a/tests/virt/events_test.py +++ b/tests/virt/events_test.py @@ -1,23 +1,7 @@ -# # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/externaldata_test.py b/tests/virt/externaldata_test.py index 3401dd95b5..46a18a660a 100644 --- a/tests/virt/externaldata_test.py +++ b/tests/virt/externaldata_test.py @@ -1,20 +1,6 @@ # Copyright 2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging diff --git a/tests/virt/fakedomainadapter.py b/tests/virt/fakedomainadapter.py index de1f4a5c82..1a0531b4a8 100644 --- a/tests/virt/fakedomainadapter.py +++ b/tests/virt/fakedomainadapter.py @@ -1,22 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import xml.etree.ElementTree as etree diff --git a/tests/virt/filedata_test.py b/tests/virt/filedata_test.py index 1e4c3c138a..5ac8619ce8 100644 --- a/tests/virt/filedata_test.py +++ b/tests/virt/filedata_test.py @@ -1,19 +1,6 @@ # Copyright 2020-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Refer to the README and COPYING files for full details of the license. +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from collections import namedtuple from contextlib import contextmanager diff --git a/tests/virt/guestagent_test.py b/tests/virt/guestagent_test.py index 869e642c42..0dba5489c7 100644 --- a/tests/virt/guestagent_test.py +++ b/tests/virt/guestagent_test.py @@ -1,23 +1,6 @@ -# # Copyright 2012-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/guestagenthelpers_test.py b/tests/virt/guestagenthelpers_test.py index 53b1e3583c..2bddb55520 100644 --- a/tests/virt/guestagenthelpers_test.py +++ b/tests/virt/guestagenthelpers_test.py @@ -1,22 +1,6 @@ -# # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/libvirtnetwork_test.py b/tests/virt/libvirtnetwork_test.py index 1d517f50e1..717108ee4e 100644 --- a/tests/virt/libvirtnetwork_test.py +++ b/tests/virt/libvirtnetwork_test.py @@ -1,22 +1,6 @@ # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/livemerge_test.py b/tests/virt/livemerge_test.py index 30357a7a2b..72ed9fd405 100644 --- a/tests/virt/livemerge_test.py +++ b/tests/virt/livemerge_test.py @@ -1,22 +1,7 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + import json import libvirt import logging diff --git a/tests/virt/metadata_storage_test.py b/tests/virt/metadata_storage_test.py index 565ae2009c..e072924983 100644 --- a/tests/virt/metadata_storage_test.py +++ b/tests/virt/metadata_storage_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/metadata_test.py b/tests/virt/metadata_test.py index c28ea8fa17..fb2cc63501 100644 --- a/tests/virt/metadata_test.py +++ b/tests/virt/metadata_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/periodic_test.py b/tests/virt/periodic_test.py index 05847f90b3..457d7ac3e3 100644 --- a/tests/virt/periodic_test.py +++ b/tests/virt/periodic_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/powerdown_test.py b/tests/virt/powerdown_test.py index 297e2e29a1..70fff4cac8 100644 --- a/tests/virt/powerdown_test.py +++ b/tests/virt/powerdown_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/prepared_test.py b/tests/virt/prepared_test.py index 1d9f53a917..9f34469cb6 100644 --- a/tests/virt/prepared_test.py +++ b/tests/virt/prepared_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/qemuguestagent_test.py b/tests/virt/qemuguestagent_test.py index 480f00f06e..1e47aa44cd 100644 --- a/tests/virt/qemuguestagent_test.py +++ b/tests/virt/qemuguestagent_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/sampling_test.py b/tests/virt/sampling_test.py index e207721f4e..a6e6a85869 100644 --- a/tests/virt/sampling_test.py +++ b/tests/virt/sampling_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/seal_job_test.py b/tests/virt/seal_job_test.py index b63af88476..db91c8dbc8 100644 --- a/tests/virt/seal_job_test.py +++ b/tests/virt/seal_job_test.py @@ -1,21 +1,6 @@ # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/thinp_monitor_test.py b/tests/virt/thinp_monitor_test.py index f77fe5db11..e88c73bbb2 100644 --- a/tests/virt/thinp_monitor_test.py +++ b/tests/virt/thinp_monitor_test.py @@ -1,22 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ TODO: diff --git a/tests/virt/thinp_test.py b/tests/virt/thinp_test.py index 7dc5d12424..5cc23e7143 100644 --- a/tests/virt/thinp_test.py +++ b/tests/virt/thinp_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import logging diff --git a/tests/virt/transient_test.py b/tests/virt/transient_test.py index 0b4bba39ae..a089cc3dbd 100644 --- a/tests/virt/transient_test.py +++ b/tests/virt/transient_test.py @@ -1,21 +1,6 @@ # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/utils_test.py b/tests/virt/utils_test.py index b387df4540..54a56af7cd 100644 --- a/tests/virt/utils_test.py +++ b/tests/virt/utils_test.py @@ -1,23 +1,6 @@ -# # Copyright 2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/tests/virt/v2v_test.py b/tests/virt/v2v_test.py index 0e8c6292c1..f32c4a9c54 100644 --- a/tests/virt/v2v_test.py +++ b/tests/virt/v2v_test.py @@ -1,21 +1,6 @@ # Copyright 2014-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/virdomain_test.py b/tests/virt/virdomain_test.py index f1cacc397e..04c3f71a5b 100644 --- a/tests/virt/virdomain_test.py +++ b/tests/virt/virdomain_test.py @@ -1,23 +1,7 @@ -# encoding: utf-8 -# # Copyright 2018-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vm_create_test.py b/tests/virt/vm_create_test.py index 8685934875..4d7fb33fc9 100644 --- a/tests/virt/vm_create_test.py +++ b/tests/virt/vm_create_test.py @@ -1,23 +1,6 @@ -# # Copyright 2017-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vm_libvirt_hook_test.py b/tests/virt/vm_libvirt_hook_test.py index 58b2cac84c..c91e86f604 100644 --- a/tests/virt/vm_libvirt_hook_test.py +++ b/tests/virt/vm_libvirt_hook_test.py @@ -1,21 +1,6 @@ # Copyright 2019-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import io diff --git a/tests/virt/vm_test.py b/tests/virt/vm_test.py index 968be24918..6cd6d877d7 100644 --- a/tests/virt/vm_test.py +++ b/tests/virt/vm_test.py @@ -1,23 +1,7 @@ -# -# Copyright IBM Corp. 2012 # Copyright 2013-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# Copyright IBM Corp. 2012 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmfakelib.py b/tests/virt/vmfakelib.py index e41546c57d..ad30b66e65 100644 --- a/tests/virt/vmfakelib.py +++ b/tests/virt/vmfakelib.py @@ -1,23 +1,7 @@ -# -# Copyright IBM Corp. 2012 # Copyright 2013-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# Copyright IBM Corp. 2012 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmfakelib_test.py b/tests/virt/vmfakelib_test.py index 0cbc2fec1c..ff10966aa5 100644 --- a/tests/virt/vmfakelib_test.py +++ b/tests/virt/vmfakelib_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import uuid diff --git a/tests/virt/vmlease_test.py b/tests/virt/vmlease_test.py index 64716c1296..fd8b3e1291 100644 --- a/tests/virt/vmlease_test.py +++ b/tests/virt/vmlease_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmmigration_test.py b/tests/virt/vmmigration_test.py index ed7e85237a..af88a97e35 100644 --- a/tests/virt/vmmigration_test.py +++ b/tests/virt/vmmigration_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmoperations_test.py b/tests/virt/vmoperations_test.py index 258b01c62f..7ac302c0f4 100644 --- a/tests/virt/vmoperations_test.py +++ b/tests/virt/vmoperations_test.py @@ -1,23 +1,7 @@ -# -# Copyright IBM Corp. 2012 # Copyright 2013-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# Copyright IBM Corp. 2012 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmrecovery_test.py b/tests/virt/vmrecovery_test.py index 14dbb6a9aa..f9d3fd489d 100644 --- a/tests/virt/vmrecovery_test.py +++ b/tests/virt/vmrecovery_test.py @@ -1,22 +1,6 @@ -# # Copyright 2016-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmsecret_test.py b/tests/virt/vmsecret_test.py index 5d9f465174..770a24db04 100644 --- a/tests/virt/vmsecret_test.py +++ b/tests/virt/vmsecret_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmstats_test.py b/tests/virt/vmstats_test.py index 19eda5da4a..1306474a0e 100644 --- a/tests/virt/vmstats_test.py +++ b/tests/virt/vmstats_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2021 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmstorage_test.py b/tests/virt/vmstorage_test.py index 2d419b5bd6..d110807e20 100644 --- a/tests/virt/vmstorage_test.py +++ b/tests/virt/vmstorage_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmutils_test.py b/tests/virt/vmutils_test.py index 9d8d563af8..7e2122b795 100644 --- a/tests/virt/vmutils_test.py +++ b/tests/virt/vmutils_test.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/virt/vmxml_test.py b/tests/virt/vmxml_test.py index b4b07849d7..5e259e8e9f 100644 --- a/tests/virt/vmxml_test.py +++ b/tests/virt/vmxml_test.py @@ -1,23 +1,6 @@ -# -*- coding: utf-8 -*- -# # Copyright 2014-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/vmTestsData.py b/tests/vmTestsData.py index 3bd396214b..5418f67ef1 100644 --- a/tests/vmTestsData.py +++ b/tests/vmTestsData.py @@ -1,22 +1,6 @@ -# # Copyright Red Hat 2013 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/vmapi_test.py b/tests/vmapi_test.py index 319c1749da..8c34c5a019 100644 --- a/tests/vmapi_test.py +++ b/tests/vmapi_test.py @@ -1,22 +1,6 @@ -# # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/vmfakecon.py b/tests/vmfakecon.py index d437673d20..83efe6b81a 100644 --- a/tests/vmfakecon.py +++ b/tests/vmfakecon.py @@ -1,22 +1,6 @@ -# # Copyright 2015-2019 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index b3ec877bbc..66617b7a53 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2008-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later SUBDIRS = \ cpuflags \ diff --git a/vdsm_hooks/allocate_net/Makefile.am b/vdsm_hooks/allocate_net/Makefile.am index 3746b8202d..f45e37912b 100644 --- a/vdsm_hooks/allocate_net/Makefile.am +++ b/vdsm_hooks/allocate_net/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_device_create.py diff --git a/vdsm_hooks/allocate_net/before_device_create.py b/vdsm_hooks/allocate_net/before_device_create.py index d125cbec19..fa2bfb5c30 100755 --- a/vdsm_hooks/allocate_net/before_device_create.py +++ b/vdsm_hooks/allocate_net/before_device_create.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/boot_hostdev/Makefile.am b/vdsm_hooks/boot_hostdev/Makefile.am index 3617e1db4f..290f4d9139 100644 --- a/vdsm_hooks/boot_hostdev/Makefile.am +++ b/vdsm_hooks/boot_hostdev/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/boot_hostdev/before_vm_start.py b/vdsm_hooks/boot_hostdev/before_vm_start.py index b6adf88223..883012776a 100755 --- a/vdsm_hooks/boot_hostdev/before_vm_start.py +++ b/vdsm_hooks/boot_hostdev/before_vm_start.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/vdsm_hooks/checkimages/Makefile.am b/vdsm_hooks/checkimages/Makefile.am index 5fa8099d94..7f72215800 100644 --- a/vdsm_hooks/checkimages/Makefile.am +++ b/vdsm_hooks/checkimages/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/checkimages/before_vm_start.py b/vdsm_hooks/checkimages/before_vm_start.py index 96ff618d94..f873e7ade6 100755 --- a/vdsm_hooks/checkimages/before_vm_start.py +++ b/vdsm_hooks/checkimages/before_vm_start.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import division diff --git a/vdsm_hooks/checkips/Makefile.am b/vdsm_hooks/checkips/Makefile.am index 33d250b449..4ab43becda 100644 --- a/vdsm_hooks/checkips/Makefile.am +++ b/vdsm_hooks/checkips/Makefile.am @@ -1,23 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later utilsfile=checkips_utils.py servicefile=checkipsd diff --git a/vdsm_hooks/checkips/after_get_stats.py b/vdsm_hooks/checkips/after_get_stats.py index fe4094cf50..83a1206dff 100644 --- a/vdsm_hooks/checkips/after_get_stats.py +++ b/vdsm_hooks/checkips/after_get_stats.py @@ -1,23 +1,9 @@ #!/usr/bin/python3 -# + # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/checkips/checkips_utils.py b/vdsm_hooks/checkips/checkips_utils.py index c6e4a7d36b..fa3fc800bf 100644 --- a/vdsm_hooks/checkips/checkips_utils.py +++ b/vdsm_hooks/checkips/checkips_utils.py @@ -1,22 +1,7 @@ -# # Copyright 2008-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import os diff --git a/vdsm_hooks/cpuflags/Makefile.am b/vdsm_hooks/cpuflags/Makefile.am index b79f17eaf3..faaedb172a 100644 --- a/vdsm_hooks/cpuflags/Makefile.am +++ b/vdsm_hooks/cpuflags/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/vdsm_hooks/cpuflags/before_vm_start.py b/vdsm_hooks/cpuflags/before_vm_start.py index 0dae62609b..e14dfc94b5 100755 --- a/vdsm_hooks/cpuflags/before_vm_start.py +++ b/vdsm_hooks/cpuflags/before_vm_start.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/diskunmap/Makefile.am b/vdsm_hooks/diskunmap/Makefile.am index f2b9a855e8..ae4ba4c98e 100644 --- a/vdsm_hooks/diskunmap/Makefile.am +++ b/vdsm_hooks/diskunmap/Makefile.am @@ -1,23 +1,7 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/diskunmap/before_vm_start.py b/vdsm_hooks/diskunmap/before_vm_start.py index d2f49e37e7..20cbdf7a99 100755 --- a/vdsm_hooks/diskunmap/before_vm_start.py +++ b/vdsm_hooks/diskunmap/before_vm_start.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/ethtool_options/Makefile.am b/vdsm_hooks/ethtool_options/Makefile.am index f23eebfbc1..51d6839735 100644 --- a/vdsm_hooks/ethtool_options/Makefile.am +++ b/vdsm_hooks/ethtool_options/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ ethtool_options.py diff --git a/vdsm_hooks/ethtool_options/ethtool_options.py b/vdsm_hooks/ethtool_options/ethtool_options.py index e4aa3baa97..b818262b6b 100755 --- a/vdsm_hooks/ethtool_options/ethtool_options.py +++ b/vdsm_hooks/ethtool_options/ethtool_options.py @@ -1,22 +1,8 @@ #!/usr/bin/python3 + # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/extnet/Makefile.am b/vdsm_hooks/extnet/Makefile.am index b89bf19022..23ad3912a5 100644 --- a/vdsm_hooks/extnet/Makefile.am +++ b/vdsm_hooks/extnet/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ extnet_vnic.py diff --git a/vdsm_hooks/extnet/extnet_vnic.py b/vdsm_hooks/extnet/extnet_vnic.py index 960c97ef9e..4bb1815fe6 100755 --- a/vdsm_hooks/extnet/extnet_vnic.py +++ b/vdsm_hooks/extnet/extnet_vnic.py @@ -1,4 +1,8 @@ #!/usr/bin/python3 + +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Tweak an interface defintion so that its source is forced to be a specified network. Applied on a per vnic basis, it gets triggered and used by two diff --git a/vdsm_hooks/extra_ipv4_addrs/Makefile.am b/vdsm_hooks/extra_ipv4_addrs/Makefile.am index 86525dfa48..0d5c2c8274 100644 --- a/vdsm_hooks/extra_ipv4_addrs/Makefile.am +++ b/vdsm_hooks/extra_ipv4_addrs/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ extra_ipv4_addrs.py diff --git a/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py b/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py index 650873148f..1a57e34991 100644 --- a/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py +++ b/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py @@ -1,22 +1,8 @@ #!/usr/bin/python3 + # Copyright 2014-2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/fakevmstats/Makefile.am b/vdsm_hooks/fakevmstats/Makefile.am index 66facc1555..0df6a308b5 100644 --- a/vdsm_hooks/fakevmstats/Makefile.am +++ b/vdsm_hooks/fakevmstats/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py b/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py index feaa798f25..d6f856ead9 100644 --- a/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py +++ b/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import diff --git a/vdsm_hooks/faqemu/Makefile.am b/vdsm_hooks/faqemu/Makefile.am index db8cd75154..0fd8bb48d9 100644 --- a/vdsm_hooks/faqemu/Makefile.am +++ b/vdsm_hooks/faqemu/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2011-2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/vdsm_hooks/faqemu/after_get_caps.py b/vdsm_hooks/faqemu/after_get_caps.py index 964f30bb9f..7cf0bcd708 100644 --- a/vdsm_hooks/faqemu/after_get_caps.py +++ b/vdsm_hooks/faqemu/after_get_caps.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/faqemu/before_vm_start.py b/vdsm_hooks/faqemu/before_vm_start.py index d6a80fee08..02f9111edf 100644 --- a/vdsm_hooks/faqemu/before_vm_start.py +++ b/vdsm_hooks/faqemu/before_vm_start.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2011 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/fcoe/Makefile.am b/vdsm_hooks/fcoe/Makefile.am index c1dcc540d5..823bd997e0 100644 --- a/vdsm_hooks/fcoe/Makefile.am +++ b/vdsm_hooks/fcoe/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ 85-vdsm-hook-fcoe.preset \ diff --git a/vdsm_hooks/fcoe/fcoe_before_network_setup.py b/vdsm_hooks/fcoe/fcoe_before_network_setup.py index 9f15dc8d32..1efcba322a 100755 --- a/vdsm_hooks/fcoe/fcoe_before_network_setup.py +++ b/vdsm_hooks/fcoe/fcoe_before_network_setup.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import """ diff --git a/vdsm_hooks/fileinject/Makefile.am b/vdsm_hooks/fileinject/Makefile.am index 1c3ac2de48..792ba76dcd 100644 --- a/vdsm_hooks/fileinject/Makefile.am +++ b/vdsm_hooks/fileinject/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2011 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/fileinject/before_vm_start.py b/vdsm_hooks/fileinject/before_vm_start.py index 8e38bed29d..83475a0fb2 100755 --- a/vdsm_hooks/fileinject/before_vm_start.py +++ b/vdsm_hooks/fileinject/before_vm_start.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import os diff --git a/vdsm_hooks/httpsisoboot/Makefile.am b/vdsm_hooks/httpsisoboot/Makefile.am index 9c3fb78d48..8c39ff5aa9 100644 --- a/vdsm_hooks/httpsisoboot/Makefile.am +++ b/vdsm_hooks/httpsisoboot/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/httpsisoboot/before_vm_start.py b/vdsm_hooks/httpsisoboot/before_vm_start.py index e8a684ebfa..48d94d2d78 100755 --- a/vdsm_hooks/httpsisoboot/before_vm_start.py +++ b/vdsm_hooks/httpsisoboot/before_vm_start.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/localdisk/Makefile.am b/vdsm_hooks/localdisk/Makefile.am index c84ef97cda..b3eac1b051 100644 --- a/vdsm_hooks/localdisk/Makefile.am +++ b/vdsm_hooks/localdisk/Makefile.am @@ -1,23 +1,6 @@ -# # Copyright 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ 12-vdsm-localdisk.rules \ diff --git a/vdsm_hooks/log_console/Makefile.am b/vdsm_hooks/log_console/Makefile.am index 60a49cffa9..2ada6983f6 100644 --- a/vdsm_hooks/log_console/Makefile.am +++ b/vdsm_hooks/log_console/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/log_console/before_vm_start.py b/vdsm_hooks/log_console/before_vm_start.py index 77c2ed445c..2ee4088166 100755 --- a/vdsm_hooks/log_console/before_vm_start.py +++ b/vdsm_hooks/log_console/before_vm_start.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import os import re diff --git a/vdsm_hooks/log_firmware/Makefile.am b/vdsm_hooks/log_firmware/Makefile.am index b31860df79..a6e4bbea76 100644 --- a/vdsm_hooks/log_firmware/Makefile.am +++ b/vdsm_hooks/log_firmware/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/log_firmware/before_vm_start.py b/vdsm_hooks/log_firmware/before_vm_start.py index 65d1811d48..bbc9260809 100755 --- a/vdsm_hooks/log_firmware/before_vm_start.py +++ b/vdsm_hooks/log_firmware/before_vm_start.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import os import re diff --git a/vdsm_hooks/macbind/Makefile.am b/vdsm_hooks/macbind/Makefile.am index ce24a740d0..ae7e0a4b83 100644 --- a/vdsm_hooks/macbind/Makefile.am +++ b/vdsm_hooks/macbind/Makefile.am @@ -1,23 +1,7 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/macbind/before_vm_start.py b/vdsm_hooks/macbind/before_vm_start.py index 70c2b38c29..5955fd4151 100755 --- a/vdsm_hooks/macbind/before_vm_start.py +++ b/vdsm_hooks/macbind/before_vm_start.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later ''' Hook to bind a vNIC into a Bridge diff --git a/vdsm_hooks/nestedvt/Makefile.am b/vdsm_hooks/nestedvt/Makefile.am index 5d53595228..f346a9cc15 100644 --- a/vdsm_hooks/nestedvt/Makefile.am +++ b/vdsm_hooks/nestedvt/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later include $(top_srcdir)/build-aux/Makefile.subs diff --git a/vdsm_hooks/nestedvt/before_vm_start.py b/vdsm_hooks/nestedvt/before_vm_start.py index fc89248f64..0d55a2232e 100755 --- a/vdsm_hooks/nestedvt/before_vm_start.py +++ b/vdsm_hooks/nestedvt/before_vm_start.py @@ -1,23 +1,9 @@ #!/usr/bin/python3 -# + # Copyright 2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import hooking diff --git a/vdsm_hooks/openstacknet/Makefile.am b/vdsm_hooks/openstacknet/Makefile.am index 213f30a712..13406c4c58 100644 --- a/vdsm_hooks/openstacknet/Makefile.am +++ b/vdsm_hooks/openstacknet/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2011-2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later constsfile=openstacknet_utils.py diff --git a/vdsm_hooks/openstacknet/after_device_create.py b/vdsm_hooks/openstacknet/after_device_create.py index aa220b704d..9be998c0d7 100755 --- a/vdsm_hooks/openstacknet/after_device_create.py +++ b/vdsm_hooks/openstacknet/after_device_create.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + ''' OpenStack Network Hook (Post device creation) ============================================= diff --git a/vdsm_hooks/openstacknet/after_get_caps.py b/vdsm_hooks/openstacknet/after_get_caps.py index 03ffa8066f..3932632365 100755 --- a/vdsm_hooks/openstacknet/after_get_caps.py +++ b/vdsm_hooks/openstacknet/after_get_caps.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2018 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/openstacknet/after_vm_start.py b/vdsm_hooks/openstacknet/after_vm_start.py index 67ce393323..22430468da 100644 --- a/vdsm_hooks/openstacknet/after_vm_start.py +++ b/vdsm_hooks/openstacknet/after_vm_start.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + ''' OpenStack Network Hook (Post vm start) ============================================= diff --git a/vdsm_hooks/openstacknet/before_device_create.py b/vdsm_hooks/openstacknet/before_device_create.py index d2d8d40593..b4f166890c 100755 --- a/vdsm_hooks/openstacknet/before_device_create.py +++ b/vdsm_hooks/openstacknet/before_device_create.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + ''' OpenStack Network Hook ====================== diff --git a/vdsm_hooks/openstacknet/openstacknet_utils.py b/vdsm_hooks/openstacknet/openstacknet_utils.py index 1e26e452df..baff6f64b9 100644 --- a/vdsm_hooks/openstacknet/openstacknet_utils.py +++ b/vdsm_hooks/openstacknet/openstacknet_utils.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import print_function diff --git a/vdsm_hooks/qemucmdline/Makefile.am b/vdsm_hooks/qemucmdline/Makefile.am index c7c64d5db2..8133935723 100644 --- a/vdsm_hooks/qemucmdline/Makefile.am +++ b/vdsm_hooks/qemucmdline/Makefile.am @@ -1,22 +1,7 @@ -# # Copyright 2012 IBM Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/qemucmdline/before_vm_start.py b/vdsm_hooks/qemucmdline/before_vm_start.py index 2b3d2280f4..0c7a651127 100755 --- a/vdsm_hooks/qemucmdline/before_vm_start.py +++ b/vdsm_hooks/qemucmdline/before_vm_start.py @@ -1,23 +1,9 @@ #!/usr/bin/python3 -# + # Copyright 2012 IBM Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import os diff --git a/vdsm_hooks/scratchpad/Makefile.am b/vdsm_hooks/scratchpad/Makefile.am index b64149743d..713e746705 100644 --- a/vdsm_hooks/scratchpad/Makefile.am +++ b/vdsm_hooks/scratchpad/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2011 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_vm_start.py \ diff --git a/vdsm_hooks/scratchpad/after_vm_destroy.py b/vdsm_hooks/scratchpad/after_vm_destroy.py index 1d42eb1ab4..f322a45f44 100755 --- a/vdsm_hooks/scratchpad/after_vm_destroy.py +++ b/vdsm_hooks/scratchpad/after_vm_destroy.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import os diff --git a/vdsm_hooks/scratchpad/before_vm_migrate_source.py b/vdsm_hooks/scratchpad/before_vm_migrate_source.py index 48a5e355ba..efbf2bc3a1 100755 --- a/vdsm_hooks/scratchpad/before_vm_migrate_source.py +++ b/vdsm_hooks/scratchpad/before_vm_migrate_source.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import os diff --git a/vdsm_hooks/scratchpad/before_vm_start.py b/vdsm_hooks/scratchpad/before_vm_start.py index d874f84218..7ea1cfa5e7 100755 --- a/vdsm_hooks/scratchpad/before_vm_start.py +++ b/vdsm_hooks/scratchpad/before_vm_start.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import os diff --git a/vdsm_hooks/smbios/Makefile.am b/vdsm_hooks/smbios/Makefile.am index c11c7c053b..d176ab2ee1 100644 --- a/vdsm_hooks/smbios/Makefile.am +++ b/vdsm_hooks/smbios/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2011 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/smbios/before_vm_start.py b/vdsm_hooks/smbios/before_vm_start.py index 199b7046d7..6d7ab0cf22 100755 --- a/vdsm_hooks/smbios/before_vm_start.py +++ b/vdsm_hooks/smbios/before_vm_start.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import os diff --git a/vdsm_hooks/spiceoptions/Makefile.am b/vdsm_hooks/spiceoptions/Makefile.am index ba27a694a7..852d253519 100644 --- a/vdsm_hooks/spiceoptions/Makefile.am +++ b/vdsm_hooks/spiceoptions/Makefile.am @@ -1,23 +1,7 @@ -# # Copyright 2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + EXTRA_DIST = \ before_vm_start.py diff --git a/vdsm_hooks/spiceoptions/before_vm_start.py b/vdsm_hooks/spiceoptions/before_vm_start.py index c33e1fb305..2d60fbc906 100755 --- a/vdsm_hooks/spiceoptions/before_vm_start.py +++ b/vdsm_hooks/spiceoptions/before_vm_start.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import from __future__ import print_function import ast diff --git a/vdsm_hooks/vhostmd/Makefile.am b/vdsm_hooks/vhostmd/Makefile.am index 0e58672aca..d1801cc619 100644 --- a/vdsm_hooks/vhostmd/Makefile.am +++ b/vdsm_hooks/vhostmd/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2011 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ after_vm_destroy.py \ diff --git a/vdsm_hooks/vhostmd/after_vm_destroy.py b/vdsm_hooks/vhostmd/after_vm_destroy.py index 22269af747..f5a31fc20a 100644 --- a/vdsm_hooks/vhostmd/after_vm_destroy.py +++ b/vdsm_hooks/vhostmd/after_vm_destroy.py @@ -1,23 +1,9 @@ #!/usr/bin/python3 -# + # Copyright 2011-2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + from __future__ import absolute_import import os diff --git a/vdsm_hooks/vhostmd/before_vm_start.py b/vdsm_hooks/vhostmd/before_vm_start.py index 2dfe0a3d99..254727f7ac 100755 --- a/vdsm_hooks/vhostmd/before_vm_start.py +++ b/vdsm_hooks/vhostmd/before_vm_start.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2011-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later import enum import os.path diff --git a/vdsm_hooks/vmfex_dev/Makefile.am b/vdsm_hooks/vmfex_dev/Makefile.am index 55197965da..2b36e174a6 100644 --- a/vdsm_hooks/vmfex_dev/Makefile.am +++ b/vdsm_hooks/vmfex_dev/Makefile.am @@ -1,22 +1,6 @@ -# # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later EXTRA_DIST = \ vmfex_vnic.py diff --git a/vdsm_hooks/vmfex_dev/vmfex_vnic.py b/vdsm_hooks/vmfex_dev/vmfex_vnic.py index b774d6468b..06d22b5160 100755 --- a/vdsm_hooks/vmfex_dev/vmfex_vnic.py +++ b/vdsm_hooks/vmfex_dev/vmfex_vnic.py @@ -1,23 +1,8 @@ #!/usr/bin/python3 -# + # Copyright 2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: 2022 Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later """ Modify a network interface definition so that it uses a Cisco VM-FEX Port