Change in vdsm[master]: v2v: drop old el6 test code

shavivi at redhat.com shavivi at redhat.com
Sun Feb 7 09:12:12 UTC 2016


Shahar Havivi has uploaded a new change for review.

Change subject: v2v: drop old el6 test code
......................................................................

v2v: drop old el6 test code

Change-Id: I332324a97b2f9d2f142c959176515bea126f65ef
Signed-off-by: Shahar Havivi <shaharh at redhat.com>
---
M tests/v2vTests.py
M vdsm/v2v.py
2 files changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/53155/1

diff --git a/tests/v2vTests.py b/tests/v2vTests.py
index b3988c9..a124d76 100644
--- a/tests/v2vTests.py
+++ b/tests/v2vTests.py
@@ -35,7 +35,6 @@
 from vdsm.utils import CommandPath
 
 
-from nose.plugins.skip import SkipTest
 from testlib import VdsmTestCase as TestCaseBase, recorded
 from monkeypatch import MonkeyPatch, MonkeyPatchScope
 
@@ -293,9 +292,6 @@
         v2v._jobs.clear()
 
     def testGetExternalVMs(self):
-        if not v2v.supported():
-            raise SkipTest('v2v is not supported current os version')
-
         def _connect(uri, username, passwd):
             return MockVirConnect(vms=self._vms)
 
@@ -407,9 +403,6 @@
             (v2v.DiskProgress(100))])
 
     def testGetExternalVMsWithoutDisksInfo(self):
-        if not v2v.supported():
-            raise SkipTest('v2v is not supported current os version')
-
         def internal_error(name):
             raise fake.Error(libvirt.VIR_ERR_INTERNAL_ERROR)
 
diff --git a/vdsm/v2v.py b/vdsm/v2v.py
index 4b7851c..47a5a4a 100644
--- a/vdsm/v2v.py
+++ b/vdsm/v2v.py
@@ -45,8 +45,6 @@
 from vdsm.infra import zombiereaper
 from vdsm.utils import traceback, CommandPath, NICENESS, IOCLASS
 
-import caps
-
 
 _lock = threading.Lock()
 _jobs = {}
@@ -135,15 +133,7 @@
     ''' Invalid input received '''
 
 
-def supported():
-    return not (caps.getos() in (caps.OSName.RHEVH, caps.OSName.RHEL)
-                and caps.osversion()['version'].startswith('6'))
-
-
 def get_external_vms(uri, username, password):
-    if not supported():
-        return errCode["noimpl"]
-
     try:
         conn = libvirtconnection.open_connection(uri=uri,
                                                  username=username,


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I332324a97b2f9d2f142c959176515bea126f65ef
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shavivi at redhat.com>


More information about the vdsm-patches mailing list