Change in vdsm[master]: lib: move define.py under common

[automation]

gerrit-hooks has posted comments on this change.

Change subject: lib: move define.py under common
..


Patch Set 3:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[danken]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: lib: move define.py under common
..


lib: move define.py under common

The commit fc732ae broke the rule that code under lib/vdsm/common
should depend only on code under the same subtree.

Another module which should be moved to fix the breakage is
define.py. Again this makes sense to move anyway.
It should go away soon, but for the meantime let's have this here.

Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Signed-off-by: Francesco Romani 
Reviewed-on: https://gerrit.ovirt.org/63953
Continuous-Integration: Jenkins CI
Reviewed-by: Nir Soffer 
Reviewed-by: Piotr Kliczewski 
---
M lib/vdsm/Makefile.am
R lib/vdsm/common/define.py
M lib/vdsm/host/api.py
M lib/vdsm/momIF.py
M lib/vdsm/response.py
M lib/vdsm/rpc/bindingxmlrpc.py
M lib/vdsm/v2v.py
M lib/vdsm/virt/vmpowerdown.py
M tests/functional/momTests.py
M tests/momTests.py
M tests/responseTests.py
M tests/vmApiTests.py
M tests/vmOperationsTests.py
M tests/vmTests.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/clientIF.py
M vdsm/gluster/api.py
M vdsm/virt/migration.py
M vdsm/virt/vm.py
20 files changed, 19 insertions(+), 21 deletions(-)

Approvals:
  Piotr Kliczewski: Looks good to me, but someone else must approve
  Nir Soffer: Looks good to me, approved
  Jenkins CI: Passed CI tests
  Francesco Romani: Verified



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[piotr . kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: lib: move define.py under common
..


Patch Set 2: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[nsoffer]

Nir Soffer has posted comments on this change.

Change subject: lib: move define.py under common
..


Patch Set 2: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[fromani]

Francesco Romani has posted comments on this change.

Change subject: lib: move define.py under common
..


Patch Set 2: Verified+1

restoring score after the rebase

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[automation]

gerrit-hooks has posted comments on this change.

Change subject: lib: move define.py under common
..


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.6', 
'ovirt-4.0'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[nsoffer]

Nir Soffer has posted comments on this change.

Change subject: lib: move define.py under common
..


Patch Set 1:

Please rebase, we had lot of merges today.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[nsoffer]

Nir Soffer has posted comments on this change.

Change subject: lib: move define.py under common
..


Patch Set 1:

Francesco, can you verify?

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[piotr . kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: lib: move define.py under common
..


Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[nsoffer]

Nir Soffer has posted comments on this change.

Change subject: lib: move define.py under common
..


Patch Set 1: Code-Review+1

Simple tiny move became major surgery in vdsm :-)

Hopefuly you got this right.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
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/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[automation]

gerrit-hooks has posted comments on this change.

Change subject: lib: move define.py under common
..


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-4.0'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: lib: move define.py under common

[fromani]

Francesco Romani has uploaded a new change for review.

Change subject: lib: move define.py under common
..

lib: move define.py under common

The commit fc732ae broke the rule that code under lib/vdsm/common
should depend only on code under the same subtree.

Another module which should be moved to fix the breakage is
define.py. Again this makes sense to move anyway.
It should go away soon, but for the meantime let's have this here.

Change-Id: I634d3bac718fe0615a2aca951ec47b976967ada1
Signed-off-by: Francesco Romani 
---
M lib/vdsm/Makefile.am
R lib/vdsm/common/define.py
M lib/vdsm/host/api.py
M lib/vdsm/momIF.py
M lib/vdsm/response.py
M lib/vdsm/rpc/bindingxmlrpc.py
M lib/vdsm/v2v.py
M lib/vdsm/virt/vmpowerdown.py
M tests/functional/momTests.py
M tests/momTests.py
M tests/responseTests.py
M tests/vmApiTests.py
M tests/vmOperationsTests.py
M tests/vmTests.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/clientIF.py
M vdsm/gluster/api.py
M vdsm/virt/migration.py
M vdsm/virt/vm.py
20 files changed, 19 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/63953/1

diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index fa50d1e..077fd98 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -29,7 +29,6 @@
concurrent.py \
cpuarch.py \
cpuinfo.py \
-   define.py \
dmidecodeUtil.py \
executor.py \
health.py \
diff --git a/lib/vdsm/define.py b/lib/vdsm/common/define.py
similarity index 100%
rename from lib/vdsm/define.py
rename to lib/vdsm/common/define.py
diff --git a/lib/vdsm/host/api.py b/lib/vdsm/host/api.py
index be197b4..90ee846 100644
--- a/lib/vdsm/host/api.py
+++ b/lib/vdsm/host/api.py
@@ -28,8 +28,8 @@
 from vdsm import hooks
 from vdsm import utils
 from vdsm import metrics
+from vdsm.common.define import Kbytes, Mbytes
 from vdsm.config import config
-from vdsm.define import Kbytes, Mbytes
 from vdsm.virt import vmstatus
 
 haClient = None
diff --git a/lib/vdsm/momIF.py b/lib/vdsm/momIF.py
index 2b19292..17cb0b0 100644
--- a/lib/vdsm/momIF.py
+++ b/lib/vdsm/momIF.py
@@ -22,8 +22,8 @@
 
 import logging
 import socket
+from vdsm.common.define import Mbytes
 from vdsm.config import config
-from vdsm.define import Mbytes
 
 from vdsm.cpuarch import PAGE_SIZE_BYTES
 
diff --git a/lib/vdsm/response.py b/lib/vdsm/response.py
index 9a6f57f..9b37aeb 100644
--- a/lib/vdsm/response.py
+++ b/lib/vdsm/response.py
@@ -20,8 +20,8 @@
 
 
 from __future__ import absolute_import
-from vdsm.define import doneCode
-from vdsm.define import errCode
+from vdsm.common.define import doneCode
+from vdsm.common.define import errCode
 
 
 class MalformedResponse(Exception):
diff --git a/lib/vdsm/rpc/bindingxmlrpc.py b/lib/vdsm/rpc/bindingxmlrpc.py
index 83b5c56..b8bb3f6 100644
--- a/lib/vdsm/rpc/bindingxmlrpc.py
+++ b/lib/vdsm/rpc/bindingxmlrpc.py
@@ -34,7 +34,7 @@
 from vdsm import concurrent
 from vdsm import utils
 from vdsm import xmlrpc
-from vdsm.define import doneCode, errCode
+from vdsm.common.define import doneCode, errCode
 from vdsm.logUtils import Suppressed
 from vdsm.network.netinfo.addresses import getDeviceByIP
 import API
diff --git a/lib/vdsm/v2v.py b/lib/vdsm/v2v.py
index 4c052da..2eedf75 100644
--- a/lib/vdsm/v2v.py
+++ b/lib/vdsm/v2v.py
@@ -43,10 +43,10 @@
 import libvirt
 
 from vdsm.commands import execCmd, BUFFSIZE
+from vdsm.common.define import errCode, doneCode
 from vdsm.common import zombiereaper
 from vdsm.compat import CPopen
 from vdsm.constants import P_VDSM_LOG, P_VDSM_RUN, EXT_KVM_2_OVIRT
-from vdsm.define import errCode, doneCode
 from vdsm import cmdutils, concurrent, libvirtconnection, response
 from vdsm.utils import monotonic_time, traceback, CommandPath, \
 NICENESS, IOCLASS
diff --git a/lib/vdsm/virt/vmpowerdown.py b/lib/vdsm/virt/vmpowerdown.py
index ff3920f..52356e5 100644
--- a/lib/vdsm/virt/vmpowerdown.py
+++ b/lib/vdsm/virt/vmpowerdown.py
@@ -19,9 +19,9 @@
 #
 from __future__ import absolute_import
 
+from vdsm.common.define import doneCode, errCode
 from vdsm import response
 from vdsm import utils
-from vdsm.define import doneCode, errCode
 
 
 class VmPowerDown(object):
diff --git a/tests/functional/momTests.py b/tests/functional/momTests.py
index 4cd9be1..02f2912 100644
--- a/tests/functional/momTests.py
+++ b/tests/functional/momTests.py
@@ -29,7 +29,7 @@
 import testValidation
 from testlib import VdsmTestCase as TestCaseBase
 from nose.plugins.skip import SkipTest
-from vdsm.define import errCode
+from vdsm.common.define import errCode
 from utils import VdsProxy, SUCCESS
 
 
diff --git a/tests/momTests.py b/tests/momTests.py
index c24f364..385b251 100644
--- a/tests/momTests.py
+++ b/tests/momTests.py
@@ -22,7 +22,7 @@
 import shutil
 import tempfile
 import threading
-from vdsm.define import Mbytes
+from vdsm.common.define import Mbytes
 from vdsm.momIF import MomClient
 from mom