From Dan Kenigsberg <danken(a)redhat.com&gt;: Dan Kenigsberg has uploaded a new change for review. Change subject: move constants.P_VDSM_STORAGE to storage.constants ...................................................................... move constants.P_VDSM_STORAGE to storage.constants Change-Id: I4bf8cbe4a8c435d93e7683336d5334880de1a811 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt; --- M lib/vdsm/constants.py.in M lib/vdsm/storage/blockSD.py M lib/vdsm/storage/constants.py M lib/vdsm/storage/fileSD.py M lib/vdsm/storage/sd.py 5 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/79741/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index f851065..66c669b 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -63,7 +63,6 @@ P_VDSM_HOOKS = '@HOOKSDIR@/' # NOQA: E501 (potentially long line) P_VDSM_LIB = '@VDSMLIBDIR@/' # NOQA: E501 (potentially long line) P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_STORAGE = os.path.join(P_VDSM_RUN, 'storage/') P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line) P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line) diff --git a/lib/vdsm/storage/blockSD.py b/lib/vdsm/storage/blockSD.py index 90844c8..44d721d 100644 --- a/lib/vdsm/storage/blockSD.py +++ b/lib/vdsm/storage/blockSD.py @@ -901,7 +901,7 @@ """ Remove /run/vdsm/storage/sdUUID/imgUUID/volUUID """ - vol_run_link = os.path.join(constants.P_VDSM_STORAGE, + vol_run_link = os.path.join(sc.P_VDSM_STORAGE, self.sdUUID, imgUUID, volUUID) self.log.info("Unlinking volme runtime link: %r", vol_run_link) try: @@ -1312,7 +1312,7 @@ srcImgPath: Dir where the image volumes are. """ - sdRunDir = os.path.join(constants.P_VDSM_STORAGE, self.sdUUID) + sdRunDir = os.path.join(sc.P_VDSM_STORAGE, self.sdUUID) imgRunDir = os.path.join(sdRunDir, imgUUID) fileUtils.createdir(imgRunDir) for volUUID in volUUIDs: diff --git a/lib/vdsm/storage/constants.py b/lib/vdsm/storage/constants.py index 2fb929b..e282c2f 100644 --- a/lib/vdsm/storage/constants.py +++ b/lib/vdsm/storage/constants.py @@ -196,3 +196,5 @@ # accepts currently its all of the version but in the # future we might slice it (eg. tuple(DOMAIN_VERSION[1:])) SUPPORTED_DOMAIN_VERSIONS = DOMAIN_VERSIONS + +P_VDSM_STORAGE = os.path.join(constants.P_VDSM_RUN, 'storage/') diff --git a/lib/vdsm/storage/fileSD.py b/lib/vdsm/storage/fileSD.py index b9160d0..861b299 100644 --- a/lib/vdsm/storage/fileSD.py +++ b/lib/vdsm/storage/fileSD.py @@ -545,7 +545,7 @@ srcImgPath: Dir where the image volumes are. """ - sdRunDir = os.path.join(constants.P_VDSM_STORAGE, self.sdUUID) + sdRunDir = os.path.join(sc.P_VDSM_STORAGE, self.sdUUID) fileUtils.createdir(sdRunDir) imgRunDir = os.path.join(sdRunDir, imgUUID) self.log.debug("Creating symlink from %s to %s", srcImgPath, imgRunDir) diff --git a/lib/vdsm/storage/sd.py b/lib/vdsm/storage/sd.py index d66a1a2..5b9ece0 100644 --- a/lib/vdsm/storage/sd.py +++ b/lib/vdsm/storage/sd.py @@ -979,7 +979,7 @@ getLinkBCImagePath = getImageDir def getImageRundir(self, imgUUID): - return os.path.join(constants.P_VDSM_STORAGE, self.sdUUID, imgUUID) + return os.path.join(sc.P_VDSM_STORAGE, self.sdUUID, imgUUID) def getIsoDomainImagesDir(self): return self._manifest.getIsoDomainImagesDir() -- To view, visit https://gerrit.ovirt.org/79741 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4bf8cbe4a8c435d93e7683336d5334880de1a811 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;