X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Ftests%2Ftest_nsd.py;h=b0b54925783f8bd77b68f77504a92e3b5cf26f84;hb=c009e0adcaaa63f0a998f47020472679fd295d38;hp=175860ca2250f0b6c25d0a74588afc73a8c4d988;hpb=e84eb31aded0cb62a5523422ddc4524f6e615209;p=osm%2Fosmclient.git diff --git a/osmclient/v1/tests/test_nsd.py b/osmclient/v1/tests/test_nsd.py index 175860c..b0b5492 100644 --- a/osmclient/v1/tests/test_nsd.py +++ b/osmclient/v1/tests/test_nsd.py @@ -17,21 +17,26 @@ 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 +class TestNsd(unittest.TestCase): + def test_list_empty(self): + mock = Mock() + mock.get_cmd.return_value = list() + 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') + def test_get_notfound(self): + mock = Mock() + 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') + def test_get_found(self): + mock = Mock() + 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')