Merge "Converted vPing to leverage the object-oriented SNAPS library."

diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index d7ce70c..2484f5a 100644 (file)
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -18,7 +18,7 @@ import unittest
 from keystoneauth1.exceptions import auth_plugins
 import mock
 from robot.errors import DataError, RobotError
-from robot.result import testcase as result_testcase
+from robot.result import model
 from robot.utils.robottime import timestamp_to_secs
 
 from functest.core import testcase
@@ -49,11 +49,9 @@ class ODLVisitorTesting(unittest.TestCase):
                 'elapsedtime': 1000,
                 'text': 'Hello, World!',
                 'critical': True}
-        test = result_testcase.TestCase(name=data['name'],
-                                        status=data['status'],
-                                        message=data['text'],
-                                        starttime=data['starttime'],
-                                        endtime=data['endtime'])
+        test = model.TestCase(
+            name=data['name'], status=data['status'], message=data['text'],
+            starttime=data['starttime'], endtime=data['endtime'])
         test.parent = mock.Mock()
         config = {'name': data['parent'],
                   'criticality.test_is_critical.return_value': data[

diff --git a/requirements.txt b/requirements.txt
index 976deef..e9b32e4 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,14 +17,16 @@ python-congressclient==1.5.0
 virtualenv==15.1.0
 pexpect==4.0
 requests>=2.8.0
-robotframework==2.9.1
-robotframework-requests==0.3.8
+robotframework==3.0.2
+robotframework-httplibrary==0.4.2
+robotframework-requests==0.4.7
 robotframework-sshlibrary==2.1.3
+jmespath==0.9.2
 configObj==5.0.6
 Flask==0.10.1
 xmltodict==0.9.2
 scp==0.10.2
-paramiko==1.16.0
+paramiko==2.1.2
 subprocess32
 shyaml
 dnspython

diff --git a/test-requirements.txt b/test-requirements.txt
index 76e475d..a871137 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -21,8 +21,9 @@ python-openstackclient==2.3.0
 python-tackerclient==0.7.0
 pyyaml==3.10
 requests==2.8.0
-robotframework==2.9.1
-robotframework-requests==0.3.8
+robotframework==3.0.2
+robotframework-httplibrary==0.4.2
+robotframework-requests==0.4.7
 robotframework-sshlibrary==2.1.3
 subprocess32==3.2.7
 virtualenv==15.1.0