X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Ftests%2Ftest_vnfd.py;h=f0697422034825162983add1c12a4d35ea70fdcc;hb=8a29667fc3e9222e6ee2288c69d7a450d6bc014a;hp=6ec10311a30ec510e396c7c80fee9ca96a2338c3;hpb=4c7e237e45bc6fe209006b4837a8e6b031e78e1c;p=osm%2Fosmclient.git diff --git a/osmclient/v1/tests/test_vnfd.py b/osmclient/v1/tests/test_vnfd.py index 6ec1031..f069742 100644 --- a/osmclient/v1/tests/test_vnfd.py +++ b/osmclient/v1/tests/test_vnfd.py @@ -17,22 +17,29 @@ import unittest from mock import Mock from osmclient.v1 import vnfd +from osmclient.v1 import client from osmclient.common.exceptions import NotFound class TestVnfd(unittest.TestCase): - def test_list_empty(self): mock = Mock() mock.get_cmd.return_value = list() - assert len(vnfd.Vnfd(mock).list()) == 0 + assert len(vnfd.Vnfd(mock, client=client.Client(host="127.0.0.1")).list()) == 0 def test_get_notfound(self): mock = Mock() - mock.get_cmd.return_value = 'foo' - self.assertRaises(NotFound, vnfd.Vnfd(mock).get, 'bar') + mock.get_cmd.return_value = "foo" + self.assertRaises( + NotFound, vnfd.Vnfd(mock, client=client.Client(host="127.0.0.1")).get, "bar" + ) def test_get_found(self): mock = Mock() - mock.get_cmd.return_value = {'vnfd:vnfd': [{'name': 'foo'}]} - assert vnfd.Vnfd(mock).get('foo') + if client.Client(host="127.0.0.1")._so_version == "v3": + mock.get_cmd.return_value = {"project-vnfd:vnfd": [{"name": "foo"}]} + else: + # Backwards Compatibility + mock.get_cmd.return_value = {"vnfd:vnfd": [{"name": "foo"}]} + + assert vnfd.Vnfd(mock, client=client.Client(host="127.0.0.1")).get("foo")