X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rwlaunchpad%2Fra%2Fpytest%2Fns%2Fpingpong%2Ftest_pingpong.py;h=49cfcb55e1cf01cdb192eab1a883bc157251b01d;hb=9ad945aab0b5a992e1df860bede8ecc9b143470e;hp=ef4949cc4fea671a53be3ec52530f3f2dfd83cc2;hpb=f49375710db1acf3cd74c8651d098b7a08e8d0b2;p=osm%2FSO.git diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong.py index ef4949cc..49cfcb55 100644 --- a/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong.py +++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong.py @@ -41,18 +41,19 @@ import rift.mano.examples.ping_pong_nsd as ping_pong import gi gi.require_version('RwNsrYang', '1.0') -gi.require_version('RwVnfdYang', '1.0') +gi.require_version('ProjectNsdYang', '1.0') +gi.require_version('RwProjectVnfdYang', '1.0') gi.require_version('RwLaunchpadYang', '1.0') gi.require_version('RwBaseYang', '1.0') from gi.repository import ( - NsdYang, + ProjectNsdYang as NsdYang, RwNsrYang, RwVnfrYang, NsrYang, VnfrYang, VldYang, - RwVnfdYang, + RwProjectVnfdYang as RwVnfdYang, RwLaunchpadYang, RwBaseYang ) @@ -409,7 +410,7 @@ class TestPingPongStart(object): nsd = catalog.nsd[0] input_parameters = [] - descr_xpath = "/rw-project:project/nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/nsd:vendor" % nsd.id + descr_xpath = "/rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id='%s']/project-nsd:vendor" % nsd.id descr_value = "automation" in_param_id = str(uuid.uuid4()) @@ -597,7 +598,7 @@ class TestUpdateNsr(object): nsd = catalog.nsd[0] input_parameters = [] - descr_xpath = "/rw-project:project/nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/nsd:vendor" % nsd.id + descr_xpath = "/rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id='%s']/project-nsd:vendor" % nsd.id descr_value = "automation" in_param_id = str(uuid.uuid4())