On 07/15/2013 09:04 AM, John Ferlan wrote:
Based on review comments of v2 posting (see 2/7 for specifics):
https://www.redhat.com/archives/libvir-list/2013-July/msg00554.html
I rewrote the storage_conf.c chap parsing code. I think the first 6
patches could be squashed into 1 for a final submit, but figured I'd
post in steps to make the reviews a bit easier on the eyes.
Difference to v2:
* Remove the 'login' and 'password' from the AuthChap structure
* Reordered some of the steps taken in v2, code is essentially the
same, but the process to get there a bit different.
* The result is the 'ceph' and 'chap' <auth types are for all
intents
the same except for a few letters ('eph' and 'hap')
* Updated Osier's change to storage_backend_iscsi.c in order to remove
the 'login'/'passwd' options.
Ran 'make' & 'make check' each step along the way. Also tested with
valgrind
with no new errors.
John Ferlan (6):
storage_conf: Adjust virStoragePoolAuthType enum
storage_conf: Introduce virStoragePoolAuthSecretPtr
storage_conf: Move auth processing into virStoragePoolDefParseAuth
storage_pool: Rework chap XML to mimic ceph
storage_conf: Move username processing into common function
storage_conf: Merge AuthChap and AuthCephx into AuthSecret
Osier Yang (1):
storage: Support "chap" authentication for iscsi pool
docs/formatsecret.html.in | 10 +-
docs/formatstorage.html.in | 25 +++-
docs/schemas/storagepool.rng | 20 +--
src/conf/storage_conf.c | 150 +++++++++++----------
src/conf/storage_conf.h | 21 ++-
src/storage/storage_backend_iscsi.c | 107 ++++++++++++++-
src/storage/storage_backend_rbd.c | 13 +-
tests/storagepoolxml2xmlin/pool-iscsi-auth.xml | 4 +-
.../pool-iscsi-vendor-product.xml | 4 +-
tests/storagepoolxml2xmlout/pool-iscsi-auth.xml | 4 +-
.../pool-iscsi-vendor-product.xml | 4 +-
tests/storagepoolxml2xmlout/pool-rbd.xml | 2 +-
12 files changed, 254 insertions(+), 110 deletions(-)
I've pushed patches 1->6 and will rework patch 7 and post as a v4.
Thanks for the reviews,
John