Change in vdsm[master]: Cleanup of storage domain creation in hsm.py

Tal Nisan has uploaded a new change for review.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................

Cleanup of storage domain creation in hsm.py

This patch changes the specific per domain type creation handling is done
to remove duplicate code, allow uniform error handling when we call the
actual creation and make the flow more clear

Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Signed-off-by: Tal Nisan <tnisan(a)redhat.com&gt;
---
M vdsm/storage/hsm.py
1 file changed, 7 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/75/45375/2

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 0806abb..485e092 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -2673,24 +2673,19 @@
         # getSharedLock(connectionsResource...)
         # getExclusiveLock(sdUUID...)
         if storageType in sd.BLOCK_DOMAIN_TYPES:
-            newSD = blockSD.BlockStorageDomain.create(
-                sdUUID, domainName, domClass, typeSpecificArg, storageType,
-                domVersion)
+            create = blockSD.BlockStorageDomain.create
         elif storageType in (sd.NFS_DOMAIN, sd.POSIXFS_DOMAIN):
-            newSD = nfsSD.NfsStorageDomain.create(
-                sdUUID, domainName, domClass, typeSpecificArg, storageType,
-                domVersion)
+            create = nfsSD.NfsStorageDomain.create
         elif storageType == sd.GLUSTERFS_DOMAIN:
-            newSD = glusterSD.GlusterStorageDomain.create(
-                sdUUID, domainName, domClass, typeSpecificArg, storageType,
-                domVersion)
+            create = glusterSD.GlusterStorageDomain.create
         elif storageType == sd.LOCALFS_DOMAIN:
-            newSD = localFsSD.LocalFsStorageDomain.create(
-                sdUUID, domainName, domClass, typeSpecificArg, storageType,
-                domVersion)
+            create = localFsSD.LocalFsStorageDomain.create
         else:
             raise se.StorageDomainTypeError(storageType)
 
+        newSD = create(sdUUID, domainName, domClass, typeSpecificArg,
+                       storageType, domVersion)
+
         findMethod = self.__getSDTypeFindMethod(storageType)
         sdCache.knownSDs[sdUUID] = findMethod
         self.log.debug("knownSDs: {%s}", ", ".join("%s:
%s.%s" %


-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org

automation(a)ovirt.org has posted comments on this change.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Patch Set 1:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/45375/1/vdsm/storage/hsm.py
File vdsm/storage/hsm.py:

Line 2672: 
Line 2673:         # getSharedLock(connectionsResource...)
Line 2674:         # getExclusiveLock(sdUUID...)
Line 2675:         if storageType in sd.BLOCK_DOMAIN_TYPES:
Line 2676:             kreator = blockSD.BlockStorageDomain
Nice!

But lets simplify:

    if storageType in sd.BLOCK_DOMAIN_TYPES:
        create = blockSD.BlockStorageDomain.create
    ...

    create(...)

This eliminate the need to have the trademark "kreator" :-)
Line 2677:         elif storageType in (sd.NFS_DOMAIN, sd.POSIXFS_DOMAIN):
Line 2678:             kreator = nfsSD.NfsStorageDomain
Line 2679:         elif storageType == sd.GLUSTERFS_DOMAIN:
Line 2680:             kreator = glusterSD.GlusterStorageDomain


-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: Yes

automation(a)ovirt.org has posted comments on this change.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Patch Set 2:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Tal Nisan has posted comments on this change.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Patch Set 2: Verified+1

Verified by creating a file domain and a block domain, both worked correctly

-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Patch Set 2: Code-Review+1

-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

automation(a)ovirt.org has posted comments on this change.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Patch Set 3:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Cleanup of storage domain creation in hsm.py

This patch changes the specific per domain type creation handling is done
to remove duplicate code, allow uniform error handling when we call the
actual creation and make the flow more clear

Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Signed-off-by: Tal Nisan <tnisan(a)redhat.com&gt;
Reviewed-on: https://gerrit.ovirt.org/45375
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com&gt;
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Continuous-Integration: Jenkins CI
---
M vdsm/storage/hsm.py
1 file changed, 7 insertions(+), 12 deletions(-)

Approvals:
  Tal Nisan: Verified
  Nir Soffer: Looks good to me, approved
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org

automation(a)ovirt.org has posted comments on this change.

Change subject: Cleanup of storage domain creation in hsm.py
......................................................................


Patch Set 4:

* Update tracker::IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.

-- 
To view, visit https://gerrit.ovirt.org/45375
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4f3771e40595d77fd80811c6b7ea6bf4c768d69
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No