Change in vdsm[master]: gluster: Unbreak gluster management

[danken]

Dan Kenigsberg has posted comments on this change.

Change subject: gluster: Unbreak gluster management
..


Patch Set 1: Code-Review+2

no makePublic left.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I7efeb994e15f397714cbbd9d8f4c1882f3cb1c15
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Sahina Bose 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: gluster: Unbreak gluster management

[automation]

gerrit-hooks has posted comments on this change.

Change subject: gluster: Unbreak gluster management
..


Patch Set 2:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I7efeb994e15f397714cbbd9d8f4c1882f3cb1c15
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: gluster: Unbreak gluster management

[danken]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: gluster: Unbreak gluster management
..


gluster: Unbreak gluster management

In commit 61d7427fc1 (build: Introduce --enable-gluster-mgmt option) we
renamed makePublic, but only for the cli module used by vdsm, breaking
gluster management.

Since there are no tests for this code, the breakage was hidden. The
only clue was a skipped test in gluster_cli_tests:

test_parseStorageDevices SKIP: cannot import name makePublic

This patch completes the partial rename.

Change-Id: I7efeb994e15f397714cbbd9d8f4c1882f3cb1c15
Signed-off-by: Nir Soffer 
Reviewed-on: https://gerrit.ovirt.org/48872
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg 
---
M vdsm/gluster/api.py
M vdsm/gluster/gfapi.py
M vdsm/gluster/hooks.py
M vdsm/gluster/services.py
M vdsm/gluster/storagedev.py
M vdsm/gluster/tasks.py
6 files changed, 28 insertions(+), 28 deletions(-)

Approvals:
  Nir Soffer: Verified
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7efeb994e15f397714cbbd9d8f4c1882f3cb1c15
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: gluster: Unbreak gluster management

[automation]

gerrit-hooks has posted comments on this change.

Change subject: gluster: Unbreak gluster management
..


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.6', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I7efeb994e15f397714cbbd9d8f4c1882f3cb1c15
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: gluster: Unbreak gluster management

[nsoffer]

Nir Soffer has uploaded a new change for review.

Change subject: gluster: Unbreak gluster management
..

gluster: Unbreak gluster management

In commit 61d7427fc1 (build: Introduce --enable-gluster-mgmt option) we
renamed makePublic, but only for the cli module used by vdsm, breaking
gluster management.

Since there are no tests for this code, the breakage was hidden. The
only clue was a skipped test in gluster_cli_tests:

test_parseStorageDevices SKIP: cannot import name makePublic

This patch completes the partial rename.

Change-Id: I7efeb994e15f397714cbbd9d8f4c1882f3cb1c15
Signed-off-by: Nir Soffer 
---
M vdsm/gluster/api.py
M vdsm/gluster/gfapi.py
M vdsm/gluster/hooks.py
M vdsm/gluster/services.py
M vdsm/gluster/storagedev.py
M vdsm/gluster/tasks.py
6 files changed, 28 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/48872/1

diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 47d5dda..24a1352 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -30,7 +30,7 @@
 from storage import mount
 
 import exception as ge
-from . import makePublic
+from . import gluster_mgmt_api
 from . import safeWrite
 import fstab
 import logging
@@ -109,7 +109,7 @@
 return additionalFeatures
 
 
-@makePublic
+@gluster_mgmt_api
 def getGeoRepKeys():
 try:
 with open(GEOREP_PUB_KEY_PATH, 'r') as f:
@@ -119,7 +119,7 @@
 return pubKeys
 
 
-@makePublic
+@gluster_mgmt_api
 def updateGeoRepKeys(userName, geoRepPubKeys):
 try:
 userInfo = getpwnam(userName)
@@ -170,7 +170,7 @@
 raise ge.GlusterGeoRepPublicKeyWriteFailedException(err=[str(e)])
 
 
-@makePublic
+@gluster_mgmt_api
 def createMountBrokerRoot(userName):
 try:
 getpwnam(userName)
@@ -185,7 +185,7 @@
 return
 
 
-@makePublic
+@gluster_mgmt_api
 def mountMetaVolume(metaVolumeName):
 def _metaVolumeFstabUpdate(metaVolumeName):
 try:
@@ -232,7 +232,7 @@
 return True
 
 
-@makePublic
+@gluster_mgmt_api
 def snapshotScheduleDisable():
 command = [_snapSchedulerPath.cmd, "disable_force"]
 rc, out, err = utils.execCmd(command)
@@ -242,7 +242,7 @@
 return True
 
 
-@makePublic
+@gluster_mgmt_api
 def snapshotScheduleFlagUpdate(value):
 if not os.path.exists(LOCK_FILE_DIR):
 try:
@@ -271,7 +271,7 @@
 return True
 
 
-@makePublic
+@gluster_mgmt_api
 def processesStop():
 command = ["/bin/sh", _stopAllProcessesPath.cmd]
 rc, out, err = utils.execCmd(command)
diff --git a/vdsm/gluster/gfapi.py b/vdsm/gluster/gfapi.py
index e5105fc..ab4e079 100644
--- a/vdsm/gluster/gfapi.py
+++ b/vdsm/gluster/gfapi.py
@@ -22,7 +22,7 @@
 import os
 
 import exception as ge
-from . import makePublic
+from . import gluster_mgmt_api
 
 
 GLUSTER_VOL_PROTOCOL = 'tcp'
@@ -95,7 +95,7 @@
 raise ge.GlfsFiniException(rc=rc)
 
 
-@makePublic
+@gluster_mgmt_api
 def volumeStatvfsGet(volumeId, host=GLUSTER_VOL_HOST,
  port=GLUSTER_VOL_PORT,
  protocol=GLUSTER_VOL_PROTOCOL):
@@ -211,7 +211,7 @@
 from vdsm import utils
 
 
-@makePublic
+@gluster_mgmt_api
 def volumeStatvfs(volumeName, host=GLUSTER_VOL_HOST,
   port=GLUSTER_VOL_PORT,
   protocol=GLUSTER_VOL_PROTOCOL):
@@ -242,7 +242,7 @@
   res['f_namemax']))
 
 
-@makePublic
+@gluster_mgmt_api
 def volumeEmptyCheck(volumeName, host=GLUSTER_VOL_HOST,
  port=GLUSTER_VOL_PORT,
  protocol=GLUSTER_VOL_PROTOCOL):
diff --git a/vdsm/gluster/hooks.py b/vdsm/gluster/hooks.py
index 1d662bc..7f8013e 100644
--- a/vdsm/gluster/hooks.py
+++ b/vdsm/gluster/hooks.py
@@ -28,7 +28,7 @@
 import selinux
 import exception as ge
 from functools import wraps
-from . import makePublic
+from . import gluster_mgmt_api
 from . import safeWrite
 
 _glusterHooksPath = '/var/lib/glusterd/hooks/1'
@@ -80,7 +80,7 @@
 return wrapper
 
 
-@makePublic
+@gluster_mgmt_api
 def hooksList():
 """
 It scans files which starts from HookStatus.ENABLE or HookStatus.DISABLE
@@ -140,7 +140,7 @@
 
 
 @checkArgs
-@makePublic
+@gluster_mgmt_api
 def hookEnable(glusterCmd, hookLevel, hookName):
 enabledFile, disabledFile = _getHookFileNames(glusterCmd,
   hookLevel.lower(), hookName)
@@ -161,7 +161,7 @@
 
 
 @checkArgs
-@makePublic
+@gluster_mgmt_api
 def hookDisable(glusterCmd, hookLevel, hookName):
 enabledFile, disabledFile = _getHookFileNames(glusterCmd,
   hookLevel.lower(), hookName)
@@ -180,7 +180,7 @@
 
 
 @checkArgs
-@makePublic
+@gluster_mgmt_api
 def hookRead(glusterCmd, hookLevel, hookName):
 """
 Returns:
@@ -234,7 +234,7 @@
 
 
 @checkArgs
-@makePublic
+@gluster_mgmt_api
 def hookUpdate(glusterCmd, hookLevel, hookName, hookData, hookMd5Sum):
 try:
 return 

Change in vdsm[master]: gluster: Unbreak gluster management

[nsoffer]

Nir Soffer has posted comments on this change.

Change subject: gluster: Unbreak gluster management
..


Patch Set 1: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I7efeb994e15f397714cbbd9d8f4c1882f3cb1c15
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Sahina Bose 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches