1 files changed, 13 insertions, 5 deletions

diff --git a/lib/oeqa/runtime/cases/dldt_inference_engine.py b/lib/oeqa/runtime/cases/dldt_inference_engine.py
index 2e969975..fb35d52f 100644
--- a/lib/oeqa/runtime/cases/dldt_inference_engine.py
+++ b/lib/oeqa/runtime/cases/dldt_inference_engine.py
@@ -57,7 +57,7 @@ class DldtInferenceEngine(OERuntimeTestCase):
     @OEHasPackage(['dldt-inference-engine'])
     @OEHasPackage(['dldt-inference-engine-samples'])
     @OEHasPackage(['intel-compute-runtime'])
-    @OEHasPackage(['opencl-icd-loader'])
+    @OEHasPackage(['ocl-icd'])
     def test_dldt_ie_classification_with_gpu(self):
         (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device('GPU', self.ir_files_dir)
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
@@ -67,7 +67,11 @@ class DldtInferenceEngine(OERuntimeTestCase):
     @OEHasPackage(['dldt-inference-engine-samples'])
     @OEHasPackage(['dldt-inference-engine-vpu-firmware'])
     def test_dldt_ie_classification_with_myriad(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device('MYRIAD', self.ir_files_dir)
+        device = 'MYRIAD'
+        (status, output) = self.dldt_ie.test_check_if_openvino_device_available(device)
+        if not status:
+            self.skipTest('OpenVINO %s device not available on target machine(availalbe devices: %s)' % (device, output))
+        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device(device, self.ir_files_dir)
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
 
     @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
@@ -76,14 +80,14 @@ class DldtInferenceEngine(OERuntimeTestCase):
     @OEHasPackage(['python3-opencv'])
     @OEHasPackage(['python3-numpy'])
     def test_dldt_ie_classification_python_api_with_cpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('CPU', self.ir_files_dir, 'libcpu_extension.so')
+        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('CPU', self.ir_files_dir)
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
 
     @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
     @OEHasPackage(['dldt-inference-engine'])
     @OEHasPackage(['dldt-inference-engine-python3'])
     @OEHasPackage(['intel-compute-runtime'])
-    @OEHasPackage(['opencl-icd-loader'])
+    @OEHasPackage(['ocl-icd'])
     @OEHasPackage(['python3-opencv'])
     @OEHasPackage(['python3-numpy'])
     def test_dldt_ie_classification_python_api_with_gpu(self):
@@ -97,5 +101,9 @@ class DldtInferenceEngine(OERuntimeTestCase):
     @OEHasPackage(['python3-opencv'])
     @OEHasPackage(['python3-numpy'])
     def test_dldt_ie_classification_python_api_with_myriad(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('MYRIAD', self.ir_files_dir)
+        device = 'MYRIAD'
+        (status, output) = self.dldt_ie.test_check_if_openvino_device_available(device)
+        if not status:
+            self.skipTest('OpenVINO %s device not available on target machine(availalbe devices: %s)' % (device, output))
+        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device(device, self.ir_files_dir)
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))