getStoragePoolInfo() for non-connected pools
by agl@us.ibm.com
Using the vdscli python module, I would like to be able to enumerate all
of the known storage pools and present their metadata to the user. Such
enumeration would make it easier for a user to select which storage pool
to connect to.
I am currently enumerating the storage pool UUIDs by looping through the
list of known storage domains and gathering the referenced spUUIDs:
domains = self.vdsmConn.getStorageDomainsList()
for sdUUID in domains:
ret = self.getStorageDomainInfo(sdUUID)
vdsOK(ret)
pools |= ret['info']['pool']
return list(pools)
This seems like a clumbsy way to do this but I did not see a
getStoragePoolsList() akin to getStorageDomainList(). Is there a better
way to use the API to collect known storage pools?
Once I have the list of storage pools, I thought to collect information
about them using getStoragePoolInfo(spUUID). However, this function
seems to be arbitrarily limited to the currently connected storage pool.
Is there a good reason for this or could we make it work for all
storage pools?
Thanks!
--
Adam Litke
IBM Linux Technology Center
12 years, 8 months
Installing VDSM
by Thang Pham
Hi,
I am trying to install VDSM onto my workstation, which is running Red Hat
Enterprise Linux Workstation release 6.1 64-bit. I downloaded the latest
code from the git repository ( http://git.fedorahosted.org/git/?p=vdsm.git)
and compiled it using the following commands:
# ./autobuild.sh
# ./configure
# make
# make install
The install seemed to go well, but when I try to start vdsm
under /usr/local/share/vdsm, I get the following error:
# ./vdsm
I am the actual vdsm 4.9-0
Registering namespace 'Storage'
Enter - numThreads: 10.0, waitTimeout: 3, maxTasks: 500.0
Operation 'lvm reload operation' got the operation mutex
Operation 'lvm reload operation' released the operation mutex
Operation 'lvm reload operation' got the operation mutex
Operation 'lvm reload operation' released the operation mutex
Trying to enter sampling method (storage.sdc.refreshStorage)
Got in to sampling method
Trying to enter sampling method (storage.iscsi.rescan)
Got in to sampling method
Returning last result
Could not kill old Super Vdsm [Errno 2] No such file or directory:
'/var/run/vdsm/svdsm.pid'
Launching Super Vdsm
Trying to connect to Super Vdsm
Connect failed [Errno 2] No such file or directory
Trying to connect to Super Vdsm
Is there a procedure to start VDSM? I could not find any documentation in
the code.
Thanks,
-------------------------------------
Thang Pham
IBM Poughkeepsie
12 years, 8 months
Looking to help out with documentation, unit testing and maintenance of vdsm.
by lyarwood@redhat.com
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hello List,
My name is Lee Yarwood and I am a Technical Support Engineer with Red
Hat currently based over in Farnborough, UK.
I've been following the vdsm project internally for some time now and
with the release of the public git repo I'd like to start helping out
with documentation, unit testing and other maintenance patches during
the upcoming beta window.
Does the team have a central project resource like trac etc that
documents any TODOs like these that I could start looking into? I'd even
be happy with helping setting this up if required.
Anyway let me know, regards,
Lee
- --
Lee Yarwood, RHCE
Technical Support Engineer, Team Lead.
Red Hat UK Ltd
200 Fowler Avenue IQ Farnborough, Farnborough, Hants GU14 7JP
Registered in England and Wales under Company Registration No. 03798903
Directors: Michael Cunningham (USA), Brendan Lane (Ireland), Matt
Parson(USA), Charlie Peters (USA)
GPG fingerprint : A5D1 9385 88CB 7E5F BE64 6618 BCA6 6E33 F672 2D76
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJOSnGtAAoJELymbjP2ci12kDIIAOmOA4IfkNGOMC+4hWFIXHgz
L4wi4ql6kOR0Qjk8NJYLdi8KZkuagr1uY2t3jcv0+0lxyX+FK2FeHekaX5Lkbowv
kIf/OPusQxYvR9GeEIaD44BFpDZUgkalCOcYd0WbgDGXUtnt/GnQr7BEQw5zwghQ
J/adJrThEHkS+bGj1DgY5Tz4+6d2QkChcvhzsArkJGDubgi1V7mbbMv50JZw2moE
mTR3XwZcqilQRPhJpkTqNb0dimECQ67Efck96FBvTpMLizQlhG4M0U0gf2M1zCtU
GZ7UygIw8ghRUErQGHASbnGT/heDCFsMb6od3gNzW1LP9frPQg2SZObMk4Gcc8E=
=p/ld
-----END PGP SIGNATURE-----
12 years, 9 months
Build system changes
by smizrahi@redhat.com
Thanks to the good and diligent work of Federico and Dan B we now have a
better build process.
The job is not done and there are more changes ahead but I just wanted
to let everyone know that just doing `$ make` will NOT build an RPM any
more. only `$ make rpm` will build you one.
Change your scripts accordingly.
Thanks again to Federico and Dan B. A simple and standard build process
is crucial for community adoption.
12 years, 9 months
Test mail
by lyarwood@redhat.com
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Sorry for the spam all, quick test mail, I didn't receive the reply to
my previous post for some reason....
Lee
- --
Lee Yarwood, RHCE
Technical Support Engineer, Team Lead.
Red Hat UK Ltd
200 Fowler Avenue IQ Farnborough, Farnborough, Hants GU14 7JP
Registered in England and Wales under Company Registration No. 03798903
Directors: Michael Cunningham (USA), Brendan Lane (Ireland), Matt
Parson(USA), Charlie Peters (USA)
GPG fingerprint : A5D1 9385 88CB 7E5F BE64 6618 BCA6 6E33 F672 2D76
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJOUjIKAAoJELymbjP2ci12UEoH/jLNhTHcjWcLv5FOnXhkpDgG
bdhJ6dv/MQV/w33RE6iMAd4lsA1zwOjGh6ws5T8QogJO+QCnYhdZq5hbwjE1L31B
m3aGq2tvdJP/I0Ecsm5ga7I4oARL2dtNFVWs3HJVM1elidtttlopIJb8DGRfSFbt
UGjYUUC4J86es+IMe+EQ1Ye4IWz8Yz47l5u6qnFuV5Y1hEZtrpKHWzEmQ+Yoe9kX
Xs4prt4eAIfqMGGsbYgQwziXW45GYTdVH6QQGRuHJ8zrSQ5uCB7uIbSekbMNirOy
9zs3x2iBIn6atAb8VZ7ZuqNxAVaB8RU3DIxNSuNlMCstLZkxwaPxWo41KLUxVVE=
=SsD1
-----END PGP SIGNATURE-----
12 years, 9 months
[PATCH] Add some useful content to the AUTHORS file
by Daniel P. Berrange
From: "Daniel P. Berrange" <berrange(a)redhat.com>
This patch is almost certainly not correct. I just picked all
the people in the Fedora GIT commit ACL for this. The rest of
the contributors were culled from the GIT changelogs. Someone
can likely advise me on the correct info where I made mistakes.
---
AUTHORS | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index e69de29..08bc0dc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -0,0 +1,28 @@
+ VDSM Author Credits
+ ===================
+
+The VDSM project current primary maintainers with commit
+access are
+
+ Dan Kenigsberg <danken(a)redhat.com>
+ Federico Simoncelli <fsimonce(a)redhat.com>
+ Saggi Mizrahi <smizrahi(a)redhat.com>
+
+Patches have also been contributed by:
+
+ Haim Ateya <hateya(a)redhat.com>
+ Daniel P. Berrange <berrange(a)redhat.com>
+ Gal Hammer <ghammer(a)redhat.com>
+ Juan Hernandez <juan.hernandez(a)redhat.com>
+ Igor Lvovsky <ilvovsky(a)redhat.com>
+ Robert Munilla <rmunilla(a)redhat.com>
+ Sanjay Mehrotra <smehrotr(a)redhat.com>
+ David Naori <dnaori(a)redhat.com>
+ Yotam Oron <yoron(a)redhat.com>
+ Tabula Rasa <cleanslate(a)redhat.com>
+ Erez Sh <erez(a)redhat.com>
+ Erez Shinan <eshinan(a)redhat.com>
+ Eduardo Warszawski <ewarszaw(a)redhat.com>
+
+ [....send patches to get your name here....]
+
--
1.7.6
12 years, 9 months
[PATCH] Add missing GPLv2+ headers & standardize existing headers
by Daniel P. Berrange
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Ensure all .py and .sh files contain a standardized GPLv2+
header comment. This fixes the obsolete references to the
now deleted LICENSE_GPL_v2 files
All copyright dates are extended to cover 2011. Any files
without existing headers had a 2011 date stamp added.
Recommendation is for all dates to be extended on the 1st
of Jan each year
---
re/dsaversion.py | 21 ++++++++++++++++---
vds_bootstrap/vds_bootstrap.py | 19 ++++++++++++++++++
vds_bootstrap/vds_bootstrap_complete.py | 19 ++++++++++++++---
vds_bootstrap/vds_qualifier.py | 20 +++++++++++++++---
vdsm/betterThreading.py | 20 +++++++++++++++---
vdsm/caps.py | 20 +++++++++++++++++++
vdsm/clientIF.py | 20 +++++++++++++++++++
vdsm/config.py | 20 +++++++++++++++++++
vdsm/configNetwork.py | 19 ++++++++++++++++++
vdsm/constants.py.in.in | 21 ++++++++++++++++++-
vdsm/define.py | 20 +++++++++++++++++++
vdsm/guestIF.py | 20 +++++++++++++++++++
vdsm/hooking.py | 20 +++++++++++++++++++
vdsm/hooks.py | 20 +++++++++++++++---
vdsm/kaxmlrpclib.py | 27 +++++++++++++++++++------
vdsm/ksm.py | 20 +++++++++++++++++++
vdsm/libvirtconnection.py | 20 +++++++++++++++---
vdsm/libvirtev.py | 16 +++++++++++++++
vdsm/libvirtvm.py | 20 +++++++++++++++---
vdsm/logCollector.sh | 19 ++++++++++++++++-
vdsm/logUtils.py | 20 +++++++++++++++++++
vdsm/mk_sysprep_floppy.in | 18 +++++++++++++++++
vdsm/mk_vdsm.conf.sample.py | 19 ++++++++++++++++++
vdsm/neterrors.py | 20 +++++++++++++++++++
vdsm/netinfo.py | 20 +++++++++++++++---
vdsm/pthread.py | 20 +++++++++++++++---
vdsm/storage/__init__.py | 17 ++++++++++++++++
vdsm/storage/blockSD.py | 19 ++++++++++++++---
vdsm/storage/blockVolume.py | 20 ++++++++++++++----
vdsm/storage/devicemapper.py | 20 +++++++++++++++++++
vdsm/storage/dispatcher.py | 19 ++++++++++++++++-
vdsm/storage/fileSD.py | 19 ++++++++++++++---
vdsm/storage/fileUtils.py | 20 ++++++++++++++----
vdsm/storage/fileVolume.py | 20 ++++++++++++++----
vdsm/storage/hba.py | 20 ++++++++++++++----
vdsm/storage/hsm.py | 19 ++++++++++++++---
vdsm/storage/image.py | 20 ++++++++++++++----
vdsm/storage/iscsi.py | 20 ++++++++++++++----
vdsm/storage/localFsSD.py | 20 ++++++++++++++----
vdsm/storage/lvm.py | 19 ++++++++++++++---
vdsm/storage/misc.py | 19 ++++++++++++++---
vdsm/storage/multipath.py | 20 ++++++++++++++----
vdsm/storage/nfsSD.py | 21 +++++++++++++++----
vdsm/storage/outOfProcess.py | 20 +++++++++++++++++++
vdsm/storage/persistentDict.py | 20 +++++++++++++++---
vdsm/storage/processPool.py | 20 +++++++++++++++++++
vdsm/storage/protect/spmprotect.sh | 19 ++++++++++++++++++
vdsm/storage/protect/spmstop.sh | 19 ++++++++++++++++++
vdsm/storage/resourceFactories.py | 19 ++++++++++++++---
vdsm/storage/resourceManager.py | 20 +++++++++++++++++++
vdsm/storage/safelease.py | 20 +++++++++++++++++++
vdsm/storage/sd.py | 20 ++++++++++++++----
vdsm/storage/sdc.py | 20 +++++++++++++++---
vdsm/storage/sdf.py | 19 ++++++++++++++---
vdsm/storage/sp.py | 19 ++++++++++++++---
vdsm/storage/spm.py | 19 ++++++++++++++---
vdsm/storage/storageConstants.py | 20 +++++++++++++++++-
vdsm/storage/storage_connection.py | 19 ++++++++++++++---
vdsm/storage/storage_exception.py | 19 ++++++++++++++---
vdsm/storage/storage_mailbox.py | 20 ++++++++++++++----
vdsm/storage/task.py | 19 ++++++++++++++---
vdsm/storage/taskManager.py | 19 ++++++++++++++---
vdsm/storage/threadLocal.py | 20 +++++++++++++++++++
vdsm/storage/threadPool.py | 20 +++++++++++++++++++
vdsm/storage/volume.py | 21 +++++++++++++++----
vdsm/substitute_constants.py | 19 ++++++++++++++++++
vdsm/supervdsm.py | 20 +++++++++++++++++++
vdsm/supervdsmServer.py | 20 +++++++++++++++++++
vdsm/ut/creator.py | 19 ++++++++++++++++++
vdsm/ut/ivdsm.py | 20 +++++++++++++++++++
vdsm/ut/testGuestChannel.py | 20 +++++++++++++++++++
vdsm/utils.py | 21 ++++++++++++++++---
vdsm/vdsm-sosplugin.py.in | 32 ++++++++++++++++++------------
vdsm/vdsmDebugPlugin.py | 20 +++++++++++++++++++
vdsm/vm.py | 20 +++++++++++++++---
vdsm_cli/dumpStorageTable.py | 20 +++++++++++++++++++
vdsm_cli/vdsClient.py | 19 ++++++++++++++++++
vdsm_cli/vdscli.py.in | 17 ++++++++++++++-
vdsm_hooks/faqemu/before_vm_start.py | 19 ++++++++++++++++++
vdsm_hooks/vhostmd/after_vm_destroy.py | 19 ++++++++++++++++++
vdsm_hooks/vhostmd/before_vm_start.py | 19 ++++++++++++++++++
vdsm_log/vdsmlog.sh | 20 +++++++++++++++++++
vdsm_reg/config.py | 20 +++++++++++++++++++
vdsm_reg/define.py | 20 +++++++++++++++++++
vdsm_reg/deployUtil.py.in | 20 +++++++++++++++++-
vdsm_reg/rhevm.py | 16 +++++++++-----
86 files changed, 1499 insertions(+), 202 deletions(-)
diff --git a/re/dsaversion.py b/re/dsaversion.py
index 726a75a..0685add 100644
--- a/re/dsaversion.py
+++ b/re/dsaversion.py
@@ -1,10 +1,23 @@
-# Copyright 2007 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2007-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
+# Refer to the README and COPYING files for full details of the license
+#
+
"""
This module provides DSA software versioning information for
python based components
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 7929f36..1c671c5 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
# Script to check VDS compatibility.
# Input: url from web portal with last released packages
diff --git a/vds_bootstrap/vds_bootstrap_complete.py b/vds_bootstrap/vds_bootstrap_complete.py
index 566877f..1038eaa 100755
--- a/vds_bootstrap/vds_bootstrap_complete.py
+++ b/vds_bootstrap/vds_bootstrap_complete.py
@@ -1,11 +1,22 @@
#!/usr/bin/python
#
-# Copyright 2008 Red Hat, Inc. and/or its affiliates.
+# Copyright 2008-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import sys
diff --git a/vds_bootstrap/vds_qualifier.py b/vds_bootstrap/vds_qualifier.py
index 88b8c12..382da1e 100755
--- a/vds_bootstrap/vds_qualifier.py
+++ b/vds_bootstrap/vds_qualifier.py
@@ -1,11 +1,23 @@
#!/usr/bin/python
#
-# Copyright 2008 Red Hat, Inc. and/or its affiliates.
+# Copyright 2008-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
#
# Script to check VDS compatibility.
# Input:
diff --git a/vdsm/betterThreading.py b/vdsm/betterThreading.py
index 01f5bab..ca6440d 100644
--- a/vdsm/betterThreading.py
+++ b/vdsm/betterThreading.py
@@ -1,9 +1,21 @@
-# Copyright 2011 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# 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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
"""
diff --git a/vdsm/caps.py b/vdsm/caps.py
index 57a1bbf..0a75510 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
"""Collect host capabilities"""
import os
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index c5169a4..c5744e1 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import os
import traceback
import time
diff --git a/vdsm/config.py b/vdsm/config.py
index 488aa7b..b76f7af 100644
--- a/vdsm/config.py
+++ b/vdsm/config.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
# for a "singleton" config object
import ConfigParser
import constants
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 4738f6e..ac300a7 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
import sys, subprocess, os, re, traceback
import shutil
diff --git a/vdsm/constants.py.in.in b/vdsm/constants.py.in.in
index aad6b52..52efbf7 100644
--- a/vdsm/constants.py.in.in
+++ b/vdsm/constants.py.in.in
@@ -1,5 +1,22 @@
-# Copyright 2009-2010 Red Hat, Inc. All rights reserved.
-# Use is subject to license terms.
+#
+# Copyright 2009-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
+#
#
# Description: Constants definitions for vdsm and utilities.
diff --git a/vdsm/define.py b/vdsm/define.py
index 4f74d28..ca30ddf 100644
--- a/vdsm/define.py
+++ b/vdsm/define.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
errCode = { 'noVM': {'status': {'code': 1, 'message': 'Virtual machine does not exist'}},
'nfsErr': {'status': {'code': 3, 'message': 'Image repository access timeout'}},
'exist': {'status': {'code': 4, 'message': 'Virtual machine already exists'}},
diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py
index a648dec..f73c9e6 100644
--- a/vdsm/guestIF.py
+++ b/vdsm/guestIF.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import traceback, logging, threading
import time
import socket
diff --git a/vdsm/hooking.py b/vdsm/hooking.py
index e0ca856..4e96874 100644
--- a/vdsm/hooking.py
+++ b/vdsm/hooking.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
"""
hooking - various stuff useful when writing vdsm hooks
diff --git a/vdsm/hooks.py b/vdsm/hooks.py
index 1f95214..c98bf7a 100644
--- a/vdsm/hooks.py
+++ b/vdsm/hooks.py
@@ -1,9 +1,21 @@
-# Copyright 2010 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2010-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import utils
diff --git a/vdsm/kaxmlrpclib.py b/vdsm/kaxmlrpclib.py
index ec7721a..64dd37c 100644
--- a/vdsm/kaxmlrpclib.py
+++ b/vdsm/kaxmlrpclib.py
@@ -1,15 +1,28 @@
+#
+# Copyright 2008-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
+#
+
"""xmlrpclib with a keep-alive transport.
Throws a timeout exception to the client when the underlying
TCP transport is broken.
-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.
-
Inspired by Volodymyr Orlenko,
http://blog.bjola.ca/2007/08/using-timeout-with-xmlrpclib.html
diff --git a/vdsm/ksm.py b/vdsm/ksm.py
index e90983b..a32e1a3 100644
--- a/vdsm/ksm.py
+++ b/vdsm/ksm.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import threading, traceback, time
import os
import constants
diff --git a/vdsm/libvirtconnection.py b/vdsm/libvirtconnection.py
index 48030e2..1585b87 100644
--- a/vdsm/libvirtconnection.py
+++ b/vdsm/libvirtconnection.py
@@ -1,9 +1,21 @@
-# Copyright 2009, 2010 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2009-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import libvirt
diff --git a/vdsm/libvirtev.py b/vdsm/libvirtev.py
index cadb5e2..d6905b6 100644
--- a/vdsm/libvirtev.py
+++ b/vdsm/libvirtev.py
@@ -1,5 +1,21 @@
#
+# 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
#
#################################################################################
# Start off by implementing a general purpose event loop for anyones use
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 7dccafb..8731a26 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1,9 +1,21 @@
-# Copyright 2009, 2010 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2009-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import traceback
diff --git a/vdsm/logCollector.sh b/vdsm/logCollector.sh
index 9a11128..7b75f1e 100755
--- a/vdsm/logCollector.sh
+++ b/vdsm/logCollector.sh
@@ -1,7 +1,22 @@
#!/bin/bash
#
-# Copyright 2009-2010 Red Hat, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright 2009-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
#
# Description: Logs collector for RHEV
# Input:
diff --git a/vdsm/logUtils.py b/vdsm/logUtils.py
index a42ad0b..4134836 100644
--- a/vdsm/logUtils.py
+++ b/vdsm/logUtils.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import logging
import sys
diff --git a/vdsm/mk_sysprep_floppy.in b/vdsm/mk_sysprep_floppy.in
index d354474..362ab63 100644
--- a/vdsm/mk_sysprep_floppy.in
+++ b/vdsm/mk_sysprep_floppy.in
@@ -2,6 +2,24 @@
#
# make a virtual floppy disk with sysprep.inf at its root.
#
+# 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
+#
if [ $# -ne 1 ]; then
echo usage: $0 /path/to.vfd
diff --git a/vdsm/mk_vdsm.conf.sample.py b/vdsm/mk_vdsm.conf.sample.py
index 07b15f9..504d2ab 100644
--- a/vdsm/mk_vdsm.conf.sample.py
+++ b/vdsm/mk_vdsm.conf.sample.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
import re
diff --git a/vdsm/neterrors.py b/vdsm/neterrors.py
index 27555db..05c04f5 100644
--- a/vdsm/neterrors.py
+++ b/vdsm/neterrors.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
ERR_OK = 0
ERR_BAD_PARAMS = 21
ERR_BAD_ADDR = 22
diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py
index e1bbf90..c47d3fd 100644
--- a/vdsm/netinfo.py
+++ b/vdsm/netinfo.py
@@ -1,9 +1,21 @@
-# Copyright 2009-2010 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2009-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import os, glob, subprocess
diff --git a/vdsm/pthread.py b/vdsm/pthread.py
index dbeebf9..f601a09 100644
--- a/vdsm/pthread.py
+++ b/vdsm/pthread.py
@@ -1,9 +1,21 @@
-# Copyright 2011 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# 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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
"""
diff --git a/vdsm/storage/__init__.py b/vdsm/storage/__init__.py
index 6e9bbe3..97a86bb 100644
--- a/vdsm/storage/__init__.py
+++ b/vdsm/storage/__init__.py
@@ -1,2 +1,19 @@
#
+# 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
#
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 6986f71..93bdf41 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import os
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index 1b4988f..32a14f8 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
import os.path
import uuid
diff --git a/vdsm/storage/devicemapper.py b/vdsm/storage/devicemapper.py
index 29dbcd3..2fc3f49 100644
--- a/vdsm/storage/devicemapper.py
+++ b/vdsm/storage/devicemapper.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import os
import misc
from glob import glob
diff --git a/vdsm/storage/dispatcher.py b/vdsm/storage/dispatcher.py
index 474c8fa..9ddd515 100644
--- a/vdsm/storage/dispatcher.py
+++ b/vdsm/storage/dispatcher.py
@@ -1,6 +1,21 @@
#
-# Copyright 2009-2010 Red Hat, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright 2009-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
#
import traceback
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 39a9ae7..867e5fb 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import os
diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py
index 1c63078..4f57379 100644
--- a/vdsm/storage/fileUtils.py
+++ b/vdsm/storage/fileUtils.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
"""
NFS helper module
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index 9ed54ff..f8f5e98 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
import os
import uuid
diff --git a/vdsm/storage/hba.py b/vdsm/storage/hba.py
index 29faab1..0f78256 100644
--- a/vdsm/storage/hba.py
+++ b/vdsm/storage/hba.py
@@ -1,12 +1,22 @@
#
-# Copyright 2010 Red Hat, Inc. and/or its affiliates.
+# Copyright 2010-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
"""
Collect HBA information
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 5799c8f..e29bf28 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
"""
diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py
index 1c70a34..09c655c 100644
--- a/vdsm/storage/image.py
+++ b/vdsm/storage/image.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
import os
import logging
diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py
index 75f1542..92c60be 100644
--- a/vdsm/storage/iscsi.py
+++ b/vdsm/storage/iscsi.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
"""
iSCSI service module. Provides helper functions to interact with iscsiadm
diff --git a/vdsm/storage/localFsSD.py b/vdsm/storage/localFsSD.py
index 012f304..8421324 100644
--- a/vdsm/storage/localFsSD.py
+++ b/vdsm/storage/localFsSD.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
import os
from glob import glob
diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py
index d2707a2..f8f9a7a 100644
--- a/vdsm/storage/lvm.py
+++ b/vdsm/storage/lvm.py
@@ -1,10 +1,21 @@
#
-# Copyright 2010 Red Hat, Inc. and/or its affiliates.
+# Copyright 2010-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py
index 6882cfc..4dced68 100644
--- a/vdsm/storage/misc.py
+++ b/vdsm/storage/misc.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
#FIXME: Some of the methods here contain SUDO in their names and some don't.
diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py
index 392f91a..cca353f 100644
--- a/vdsm/storage/multipath.py
+++ b/vdsm/storage/multipath.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
"""
multipath module provides helper procedures for configuring multipath
diff --git a/vdsm/storage/nfsSD.py b/vdsm/storage/nfsSD.py
index abcf1ff..91285a4 100644
--- a/vdsm/storage/nfsSD.py
+++ b/vdsm/storage/nfsSD.py
@@ -1,11 +1,22 @@
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2009-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
import os
import fnmatch
diff --git a/vdsm/storage/outOfProcess.py b/vdsm/storage/outOfProcess.py
index 48a556a..60869cf 100644
--- a/vdsm/storage/outOfProcess.py
+++ b/vdsm/storage/outOfProcess.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import os as mod_os
import glob as mod_glob
import types
diff --git a/vdsm/storage/persistentDict.py b/vdsm/storage/persistentDict.py
index 3654b64..e159ae5 100644
--- a/vdsm/storage/persistentDict.py
+++ b/vdsm/storage/persistentDict.py
@@ -1,11 +1,23 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
+
"""
persistentDict module provides generic class with common verification and
validation functionality implemented.
diff --git a/vdsm/storage/processPool.py b/vdsm/storage/processPool.py
index f8ef4af..fc843c4 100644
--- a/vdsm/storage/processPool.py
+++ b/vdsm/storage/processPool.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
from multiprocessing import Pipe, Process
from threading import Lock
import os
diff --git a/vdsm/storage/protect/spmprotect.sh b/vdsm/storage/protect/spmprotect.sh
index 41bc70d..4c1a068 100755
--- a/vdsm/storage/protect/spmprotect.sh
+++ b/vdsm/storage/protect/spmprotect.sh
@@ -1,4 +1,23 @@
#!/bin/bash
+#
+# 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
+#
set +o pipefail
diff --git a/vdsm/storage/protect/spmstop.sh b/vdsm/storage/protect/spmstop.sh
index 7de8129..62e189b 100755
--- a/vdsm/storage/protect/spmstop.sh
+++ b/vdsm/storage/protect/spmstop.sh
@@ -1,4 +1,23 @@
#!/bin/bash
+#
+# 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
+#
LOGFILE="/var/log/vdsm/spm-lock.log"
KILL="/bin/kill"
diff --git a/vdsm/storage/resourceFactories.py b/vdsm/storage/resourceFactories.py
index 0b4dc92..152d00b 100644
--- a/vdsm/storage/resourceFactories.py
+++ b/vdsm/storage/resourceFactories.py
@@ -1,10 +1,21 @@
#
-# Copyright 2010 Red Hat, Inc. and/or its affiliates.
+# Copyright 2010-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import os
diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py
index 1ce8e6a..6b19563 100644
--- a/vdsm/storage/resourceManager.py
+++ b/vdsm/storage/resourceManager.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import threading
import logging
import re
diff --git a/vdsm/storage/safelease.py b/vdsm/storage/safelease.py
index 5153f3f..107d304 100644
--- a/vdsm/storage/safelease.py
+++ b/vdsm/storage/safelease.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import os.path
from config import config
import misc
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index ec4dd2b..34fbbe0 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
import os
import logging
diff --git a/vdsm/storage/sdc.py b/vdsm/storage/sdc.py
index f284e9b..c44b58e 100644
--- a/vdsm/storage/sdc.py
+++ b/vdsm/storage/sdc.py
@@ -1,11 +1,23 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
+
"""
Cache module provides general purpose (more or less) cache infrastructure
for keeping storage related data that is expensive to harvest, but needed often
diff --git a/vdsm/storage/sdf.py b/vdsm/storage/sdf.py
index b5ec3e3..2e2126d 100644
--- a/vdsm/storage/sdf.py
+++ b/vdsm/storage/sdf.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
from config import config
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 4df9efc..6fc63e4 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import os
diff --git a/vdsm/storage/spm.py b/vdsm/storage/spm.py
index b186d39..112b69f 100644
--- a/vdsm/storage/spm.py
+++ b/vdsm/storage/spm.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
"""
diff --git a/vdsm/storage/storageConstants.py b/vdsm/storage/storageConstants.py
index c929d3f..1fa8cc6 100644
--- a/vdsm/storage/storageConstants.py
+++ b/vdsm/storage/storageConstants.py
@@ -1,5 +1,21 @@
#
-# Copyright 2010 Red Hat, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright 2010-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
+#
+
STORAGE = "Storage"
diff --git a/vdsm/storage/storage_connection.py b/vdsm/storage/storage_connection.py
index d5ebc21..0d779ea 100644
--- a/vdsm/storage/storage_connection.py
+++ b/vdsm/storage/storage_connection.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import os
diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py
index 1496bbc..633fea4 100644
--- a/vdsm/storage/storage_exception.py
+++ b/vdsm/storage/storage_exception.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
########################################################
diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py
index 0c7ea21..ea2c165 100644
--- a/vdsm/storage/storage_mailbox.py
+++ b/vdsm/storage/storage_mailbox.py
@@ -1,12 +1,22 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
import thread
import os
diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py
index d430eb6..61b02c1 100644
--- a/vdsm/storage/task.py
+++ b/vdsm/storage/task.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009-2011 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
'''
diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py
index d37a46c..4934374 100644
--- a/vdsm/storage/taskManager.py
+++ b/vdsm/storage/taskManager.py
@@ -1,10 +1,21 @@
#
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the 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.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import os
diff --git a/vdsm/storage/threadLocal.py b/vdsm/storage/threadLocal.py
index 7c443d6..263dcf7 100644
--- a/vdsm/storage/threadLocal.py
+++ b/vdsm/storage/threadLocal.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import threading
vars = threading.local()
diff --git a/vdsm/storage/threadPool.py b/vdsm/storage/threadPool.py
index 2937746..6af8bd2 100644
--- a/vdsm/storage/threadPool.py
+++ b/vdsm/storage/threadPool.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import threading
from time import sleep
from Queue import Queue, Empty
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index eab13e2..272c997 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -1,11 +1,22 @@
-# Copyright 2009 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2009-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
-
from config import config
import os.path
diff --git a/vdsm/substitute_constants.py b/vdsm/substitute_constants.py
index 9596dd9..6b35f4a 100644
--- a/vdsm/substitute_constants.py
+++ b/vdsm/substitute_constants.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
import sys, re
import constants
diff --git a/vdsm/supervdsm.py b/vdsm/supervdsm.py
index 7588c6e..de071f9 100644
--- a/vdsm/supervdsm.py
+++ b/vdsm/supervdsm.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import os
from multiprocessing.managers import BaseManager
import logging
diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py
index 1f5643e..cdabea5 100755
--- a/vdsm/supervdsmServer.py
+++ b/vdsm/supervdsmServer.py
@@ -1,4 +1,24 @@
#!/usr/bin/python
+#
+# 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
+#
+
import logging
import logging.config
import sys
diff --git a/vdsm/ut/creator.py b/vdsm/ut/creator.py
index 9039205..5bf0d69 100644
--- a/vdsm/ut/creator.py
+++ b/vdsm/ut/creator.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
import commands
import sys
diff --git a/vdsm/ut/ivdsm.py b/vdsm/ut/ivdsm.py
index ef2df42..52ce8b1 100644
--- a/vdsm/ut/ivdsm.py
+++ b/vdsm/ut/ivdsm.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import os
import pwd
import logging
diff --git a/vdsm/ut/testGuestChannel.py b/vdsm/ut/testGuestChannel.py
index 2adccbb..5539d11 100755
--- a/vdsm/ut/testGuestChannel.py
+++ b/vdsm/ut/testGuestChannel.py
@@ -1,4 +1,24 @@
#!/usr/bin/python
+#
+# 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
+#
+
import os, sys, traceback
sys.path.append('/home/simong/dtv/vds/vdsm')
import time
diff --git a/vdsm/utils.py b/vdsm/utils.py
index 077fc50..a6db55d 100644
--- a/vdsm/utils.py
+++ b/vdsm/utils.py
@@ -1,10 +1,23 @@
-# Copyright 2008 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2008-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
+# Refer to the README and COPYING files for full details of the license
+#
+
"""
A module containing miscellaneous functions and classes that are user plentifuly around vdsm.
diff --git a/vdsm/vdsm-sosplugin.py.in b/vdsm/vdsm-sosplugin.py.in
index bc61007..344d500 100644
--- a/vdsm/vdsm-sosplugin.py.in
+++ b/vdsm/vdsm-sosplugin.py.in
@@ -1,16 +1,22 @@
-### This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# 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
+#
import sos.plugintools
import subprocess
diff --git a/vdsm/vdsmDebugPlugin.py b/vdsm/vdsmDebugPlugin.py
index 060c0f5..db78ada 100644
--- a/vdsm/vdsmDebugPlugin.py
+++ b/vdsm/vdsmDebugPlugin.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import os
import threading
import logging
diff --git a/vdsm/vm.py b/vdsm/vm.py
index b947b19..bbe40e3 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1,9 +1,21 @@
-# Copyright 2008-2011 Red Hat, Inc. and/or its affiliates.
#
-# Licensed to you under the GNU General Public License as published by
+# Copyright 2008-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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
#
import os, traceback
diff --git a/vdsm_cli/dumpStorageTable.py b/vdsm_cli/dumpStorageTable.py
index 3223ad6..60d5f88 100644
--- a/vdsm_cli/dumpStorageTable.py
+++ b/vdsm_cli/dumpStorageTable.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
import os
import traceback
diff --git a/vdsm_cli/vdsClient.py b/vdsm_cli/vdsClient.py
index d29cc4a..8f2dc5a 100755
--- a/vdsm_cli/vdsClient.py
+++ b/vdsm_cli/vdsClient.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
import sys
import getopt
diff --git a/vdsm_cli/vdscli.py.in b/vdsm_cli/vdscli.py.in
index 4507fe1..5644a50 100644
--- a/vdsm_cli/vdscli.py.in
+++ b/vdsm_cli/vdscli.py.in
@@ -1,10 +1,23 @@
# vdscli: contact vdsm running on localhost over xmlrpc easily
#
-# Copyright 2009-2010 Red Hat, Inc.
+# Copyright 2009-2011 Red Hat, Inc.
#
-# Licensed to you under the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
import xmlrpclib
import subprocess
diff --git a/vdsm_hooks/faqemu/before_vm_start.py b/vdsm_hooks/faqemu/before_vm_start.py
index bda1a71..5d130e1 100755
--- a/vdsm_hooks/faqemu/before_vm_start.py
+++ b/vdsm_hooks/faqemu/before_vm_start.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
import hooking
from config import config
diff --git a/vdsm_hooks/vhostmd/after_vm_destroy.py b/vdsm_hooks/vhostmd/after_vm_destroy.py
index ae06ead..026c421 100644
--- a/vdsm_hooks/vhostmd/after_vm_destroy.py
+++ b/vdsm_hooks/vhostmd/after_vm_destroy.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
import os
import subprocess
diff --git a/vdsm_hooks/vhostmd/before_vm_start.py b/vdsm_hooks/vhostmd/before_vm_start.py
index a76d19f..df09f69 100644
--- a/vdsm_hooks/vhostmd/before_vm_start.py
+++ b/vdsm_hooks/vhostmd/before_vm_start.py
@@ -1,4 +1,23 @@
#!/usr/bin/python
+#
+# 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
+#
import os
import subprocess
diff --git a/vdsm_log/vdsmlog.sh b/vdsm_log/vdsmlog.sh
index a104c81..d32df6a 100755
--- a/vdsm_log/vdsmlog.sh
+++ b/vdsm_log/vdsmlog.sh
@@ -1,3 +1,23 @@
#!/bin/bash
+#
+# 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
+#
+
ssh $1 "cat /var/log/vdsm/vdsm.log" | source-highlight -f esc --style-file=vdsmlog.style --lang-def=vdsmlog.lang | less -R
diff --git a/vdsm_reg/config.py b/vdsm_reg/config.py
index 4423009..047ddae 100644
--- a/vdsm_reg/config.py
+++ b/vdsm_reg/config.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
# for a "singleton" config object
import ConfigParser
diff --git a/vdsm_reg/define.py b/vdsm_reg/define.py
index e11c2c6..d24fde4 100644
--- a/vdsm_reg/define.py
+++ b/vdsm_reg/define.py
@@ -1,3 +1,23 @@
+#
+# 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
+#
+
errCode = { 'noVM': {'status': {'code': 1, 'message': 'Desktop does not exist'}},
'nfsErr': {'status': {'code': 3, 'message': 'Image repository access timeout'}},
'exist': {'status': {'code': 4, 'message': 'Desktop already exists'}},
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index 9acd6bb..c0ea413 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -1,5 +1,21 @@
-# Copyright 2009-2010 Red Hat, Inc. All rights reserved.
-# Use is subject to license terms.
+#
+# Copyright 2009-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
#
# Description: Deployment utilities.
diff --git a/vdsm_reg/rhevm.py b/vdsm_reg/rhevm.py
index d32c639..b2c9191 100755
--- a/vdsm_reg/rhevm.py
+++ b/vdsm_reg/rhevm.py
@@ -1,10 +1,11 @@
#!/usr/bin/python
-# rhevm.py - Copyright (C) 2011 Red Hat, Inc.
-# Written by Joey Boggs <jboggs(a)redhat.com>
+#
+# 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; version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +14,12 @@
#
# You should have received a copy of the GNU General Public 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
+# Written by Joey Boggs <jboggs(a)redhat.com>
+#
import os
import sys
--
1.7.6
12 years, 9 months
[PATCH] Make the README file more useful
by Daniel P. Berrange
From: "Daniel P. Berrange" <berrange(a)redhat.com>
It is not important to have a full GPLv2+ boilerplate in the
README file. It can just refer to the main COPYING file and
note the OpenSSL exception.
More important for the README is info about what VDSM is, how
to install it, package it and how to report bugs / get help,
etc
* README: Update content to be more useful
---
README | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/README b/README
index 314f998..e649da5 100644
--- a/README
+++ b/README
@@ -1,19 +1,61 @@
-Copyright 2009 Red Hat, Inc. and/or its affiliates.
+ VDSM: Virtual Desktop Server Manager
+ ====================================
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
+The VDSM service exposes an XML-RPC API for managing virtualization
+hosts running the KVM hypervisor technology. VDSM manages and monitors
+the host's storage, memory and networks as well as virtual machine
+creation, other host administration tasks, statistics gathering, and
+log collection.
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY, NONINFRINGEMENT or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
+VDSM service originated as a service to be used by a RHEV Manager to
+control RHEV Hypervisors and Red Hat Enterprise Linux hosts. It is
+now independent of RHEV, usable by any management application and
+is intended to be portable to any Linux host providing the KVM
+virtualization technology.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
+Installation
+============
+
+The VDSM service can be used by following the standard autotools
+installation process, documented in the INSTALL file. As a quick
+start you can do
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --libdir=/usr/lib
+ make
+ sudo make install
+
+The 'vdsm.spec' file demonstrates how to distribute VDSM as an RPM
+package.
+
+
+Getting Help
+============
+
+There are two mailing lists for discussions:
+
+ - For technical discussions about the project and its code base.
+
+
+ https://fedorahosted.org/mailman/listinfo/vdsm-devel
+
+ - For questions by users, who do not want to be swamped by
+ technicalities.
+
+ https://fedorahosted.org/mailman/listinfo/vdsm-users
+
+The developers also hang out on IRC at #vdsm hosted on freenode.net
+
+The latest upstream code can be obtained from GIT:
+
+ http://git.fedorahosted.org/git/?p=vdsm.git
+
+Licensing
+=========
+
+VDSM is provided under the terms of the GNU General Public License,
+version 2 or later. Please see the COPYING file for complete GPLv2+
+license terms.
In addition, as a special exception, Red Hat, Inc. and its affiliates
give you permission to distribute this program, or a work based on it,
@@ -26,5 +68,6 @@ contained in the combination.
If you modify this program, you may extend this exception to your
version, but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version.
+so, delete this exception statement from your version.
+-- End of readme
--
1.7.6
12 years, 9 months
[PATCH] Automatically generate ChangeLog file during make dist
by Daniel P. Berrange
From: "Daniel P. Berrange" <berrange(a)redhat.com>
This adds a script that will automatically generate the ChangeLog
file content from the git changelog. This is performed only when
running 'make dist', via an automake hook
* .gitignore: Don't ignore the entire of build-aux/
* Makefile.am: Add hook to generate ChangeLog
* build-aux/gitlog-to-changelog: Script for generating ChangeLog
from GIT history
---
.gitignore | 4 +-
Makefile.am | 14 +++
build-aux/gitlog-to-changelog | 191 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 208 insertions(+), 1 deletions(-)
create mode 100755 build-aux/gitlog-to-changelog
diff --git a/.gitignore b/.gitignore
index b273bb1..5440b3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,9 @@ Makefile.in
*.o
aclocal.m4
autom4te.cache/
-build-aux/
+build-aux/depcomp
+build-aux/install-sh
+build-aux/missing
config.log
config.status
configure
diff --git a/Makefile.am b/Makefile.am
index e71f437..e871617 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,3 +33,17 @@ srpm: dist
rpm: dist
rpmbuild --define="_topdir $(RPMTOP)" -ta $(DIST_ARCHIVES)
+
+dist-hook: gen-ChangeLog
+
+# Generate the ChangeLog file (with all entries since the switch to git)
+# and insert it into the directory we're about to use to create a tarball.
+gen_start_date = 2009-07-04
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+ if test -d .git; then \
+ $(top_srcdir)/build-aux/gitlog-to-changelog \
+ --since=$(gen_start_date) > $(distdir)/cl-t; \
+ rm -f $(distdir)/ChangeLog; \
+ mv $(distdir)/cl-t $(distdir)/ChangeLog; \
+ fi
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
new file mode 100755
index 0000000..4559704
--- /dev/null
+++ b/build-aux/gitlog-to-changelog
@@ -0,0 +1,191 @@
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+ & eval 'exec perl -wS "$0" $argv:q'
+ if 0;
+# Convert git log output to ChangeLog format.
+
+my $VERSION = '2009-10-30 13:46'; # UTC
+# The definition above must lie within the first 8 lines in order
+# for the Emacs time-stamp write hook (at end) to update it.
+# If you change this file with Emacs, please let the write hook
+# do its job. Otherwise, update this string manually.
+
+# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU 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 <http://www.gnu.org/licenses/>.
+
+# Written by Jim Meyering
+
+use strict;
+use warnings;
+use Getopt::Long;
+use POSIX qw(strftime);
+
+(my $ME = $0) =~ s|.*/||;
+
+# use File::Coda; # http://meyering.net/code/Coda/
+END {
+ defined fileno STDOUT or return;
+ close STDOUT and return;
+ warn "$ME: failed to close standard output: $!\n";
+ $? ||= 1;
+}
+
+sub usage ($)
+{
+ my ($exit_code) = @_;
+ my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
+ if ($exit_code != 0)
+ {
+ print $STREAM "Try `$ME --help' for more information.\n";
+ }
+ else
+ {
+ print $STREAM <<EOF;
+Usage: $ME [OPTIONS] [ARGS]
+
+Convert git log output to ChangeLog format. If present, any ARGS
+are passed to "git log". To avoid ARGS being parsed as options to
+$ME, they may be preceded by '--'.
+
+OPTIONS:
+
+ --since=DATE convert only the logs since DATE;
+ the default is to convert all log entries.
+ --format=FMT set format string for commit subject and body;
+ see 'man git-log' for the list of format metacharacters;
+ the default is '%s%n%b%n'
+
+ --help display this help and exit
+ --version output version information and exit
+
+EXAMPLE:
+
+ $ME --since=2008-01-01 > ChangeLog
+ $ME -- -n 5 foo > last-5-commits-to-branch-foo
+
+EOF
+ }
+ exit $exit_code;
+}
+
+# If the string $S is a well-behaved file name, simply return it.
+# If it contains white space, quotes, etc., quote it, and return the new string.
+sub shell_quote($)
+{
+ my ($s) = @_;
+ if ($s =~ m![^\w+/.,-]!)
+ {
+ # Convert each single quote to '\''
+ $s =~ s/\'/\'\\\'\'/g;
+ # Then single quote the string.
+ $s = "'$s'";
+ }
+ return $s;
+}
+
+sub quoted_cmd(@)
+{
+ return join (' ', map {shell_quote $_} @_);
+}
+
+{
+ my $since_date = '1970-01-01 UTC';
+ my $format_string = '%s%n%b%n';
+ GetOptions
+ (
+ help => sub { usage 0 },
+ version => sub { print "$ME version $VERSION\n"; exit },
+ 'since=s' => \$since_date,
+ 'format=s' => \$format_string,
+ ) or usage 1;
+
+ my @cmd = (qw (git log --log-size), "--since=$since_date",
+ '--pretty=format:%ct %an <%ae>%n%n'.$format_string, @ARGV);
+ open PIPE, '-|', @cmd
+ or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
+ . "(Is your Git too old? Version 1.5.1 or later is required.)\n");
+
+ my $prev_date_line = '';
+ while (1)
+ {
+ defined (my $in = <PIPE>)
+ or last;
+ $in =~ /^log size (\d+)$/
+ or die "$ME:$.: Invalid line (expected log size):\n$in";
+ my $log_nbytes = $1;
+
+ my $log;
+ my $n_read = read PIPE, $log, $log_nbytes;
+ $n_read == $log_nbytes
+ or die "$ME:$.: unexpected EOF\n";
+
+ my @line = split "\n", $log;
+ my $author_line = shift @line;
+ defined $author_line
+ or die "$ME:$.: unexpected EOF\n";
+ $author_line =~ /^(\d+) (.*>)$/
+ or die "$ME:$.: Invalid line "
+ . "(expected date/author/email):\n$author_line\n";
+
+ my $date_line = sprintf "%s $2\n", strftime ("%F", localtime ($1));
+ # If this line would be the same as the previous date/name/email
+ # line, then arrange not to print it.
+ if ($date_line ne $prev_date_line)
+ {
+ $prev_date_line eq ''
+ or print "\n";
+ print $date_line;
+ }
+ $prev_date_line = $date_line;
+
+ # Omit "Signed-off-by..." lines.
+ @line = grep !/^Signed-off-by: .*>$/, @line;
+
+ # If there were any lines
+ if (@line == 0)
+ {
+ warn "$ME: warning: empty commit message:\n $date_line\n";
+ }
+ else
+ {
+ # Remove leading and trailing blank lines.
+ while ($line[0] =~ /^\s*$/) { shift @line; }
+ while ($line[$#line] =~ /^\s*$/) { pop @line; }
+
+ # Prefix each non-empty line with a TAB.
+ @line = map { length $_ ? "\t$_" : '' } @line;
+
+ print "\n", join ("\n", @line), "\n";
+ }
+
+ defined ($in = <PIPE>)
+ or last;
+ $in ne "\n"
+ and die "$ME:$.: unexpected line:\n$in";
+ }
+
+ close PIPE
+ or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
+ # FIXME-someday: include $PROCESS_STATUS in the diagnostic
+}
+
+# Local Variables:
+# mode: perl
+# indent-tabs-mode: nil
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "my $VERSION = '"
+# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "'; # UTC"
+# End:
--
1.7.6
12 years, 9 months
[PATCH 0/4] Misc tweaks to facilitate automated builds
by Daniel P. Berrange
For all the libvirt based virtualization tools we are in the
process of setting up an automated build infrastructure. It
will (eventually) be running daily at
http://builder.virt-tools.org/
It is desirable to have VDSM in this too.
NB, the builds are done as a non-root, restricted user account
and should not expect to actually be able to run VMs and things
so 'make check' should focus solely on unit tests.
12 years, 9 months