X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Ftests%2Ftest_vnfd.py;h=f0697422034825162983add1c12a4d35ea70fdcc;hb=8a29667fc3e9222e6ee2288c69d7a450d6bc014a;hp=0acc051a9d5b4c15de9665f81d94183316cb04e4;hpb=e84eb31aded0cb62a5523422ddc4524f6e615209;p=osm%2Fosmclient.git diff --git a/osmclient/v1/tests/test_vnfd.py b/osmclient/v1/tests/test_vnfd.py index 0acc051..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, client=client.Client(host="127.0.0.1")).list()) == 0 - def test_list_empty(self): - mock=Mock() - mock.get_cmd.return_value=list() - assert len(vnfd.Vnfd(mock).list()) == 0 + def test_get_notfound(self): + mock = Mock() + 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_notfound(self): - mock=Mock() - mock.get_cmd.return_value='foo' - self.assertRaises(NotFound,vnfd.Vnfd(mock).get,'bar') + def test_get_found(self): + mock = Mock() + 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"}]} - def test_get_found(self): - mock=Mock() - mock.get_cmd.return_value={'vnfd:vnfd': [{'name': 'foo' }]} - assert vnfd.Vnfd(mock).get('foo') + assert vnfd.Vnfd(mock, client=client.Client(host="127.0.0.1")).get("foo")