X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Ftests%2Ftest_nsd.py;h=6f0255ea80385e8fef514e67ceae1ff6342b99c3;hb=refs%2Fheads%2Fsol006v331;hp=175ebf04c8b3715a3a0de63af78a96540a137f28;hpb=4c7e237e45bc6fe209006b4837a8e6b031e78e1c;p=osm%2Fosmclient.git diff --git a/osmclient/v1/tests/test_nsd.py b/osmclient/v1/tests/test_nsd.py index 175ebf0..6f0255e 100644 --- a/osmclient/v1/tests/test_nsd.py +++ b/osmclient/v1/tests/test_nsd.py @@ -17,22 +17,28 @@ import unittest from mock import Mock from osmclient.v1 import nsd +from osmclient.v1 import client from osmclient.common.exceptions import NotFound class TestNsd(unittest.TestCase): - def test_list_empty(self): mock = Mock() mock.get_cmd.return_value = list() - assert len(nsd.Nsd(mock).list()) == 0 + assert len(nsd.Nsd(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, nsd.Nsd(mock).get, 'bar') + mock.get_cmd.return_value = "foo" + self.assertRaises( + NotFound, nsd.Nsd(mock, client=client.Client(host="127.0.0.1")).get, "bar" + ) def test_get_found(self): mock = Mock() - mock.get_cmd.return_value = {'nsd:nsd': [{'name': 'foo'}]} - assert nsd.Nsd(mock).get('foo') + if client.Client(host="127.0.0.1")._so_version == "v3": + mock.get_cmd.return_value = {"project-nsd:nsd": [{"name": "foo"}]} + else: + # Backwards Compatibility + mock.get_cmd.return_value = {"nsd:nsd": [{"name": "foo"}]} + assert nsd.Nsd(mock, client=client.Client(host="127.0.0.1")).get("foo")