projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from master
[osm/SO.git]
/
rwlaunchpad
/
ra
/
pytest
/
ns
/
test_onboard.py
diff --git
a/rwlaunchpad/ra/pytest/ns/test_onboard.py
b/rwlaunchpad/ra/pytest/ns/test_onboard.py
index
5951ce8
..
07a31dd
100644
(file)
--- a/
rwlaunchpad/ra/pytest/ns/test_onboard.py
+++ b/
rwlaunchpad/ra/pytest/ns/test_onboard.py
@@
-37,19
+37,19
@@
import rift.auto.session
import gi
gi.require_version('RwNsrYang', '1.0')
import gi
gi.require_version('RwNsrYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('Rw
Project
VnfdYang', '1.0')
gi.require_version('RwLaunchpadYang', '1.0')
gi.require_version('RwBaseYang', '1.0')
from gi.repository import (
RwcalYang,
gi.require_version('RwLaunchpadYang', '1.0')
gi.require_version('RwBaseYang', '1.0')
from gi.repository import (
RwcalYang,
- NsdYang,
+
ProjectNsdYang as
NsdYang,
RwNsrYang,
RwVnfrYang,
NsrYang,
VnfrYang,
VldYang,
RwNsrYang,
RwVnfrYang,
NsrYang,
VnfrYang,
VldYang,
- RwVnfdYang,
+ Rw
ProjectVnfdYang as Rw
VnfdYang,
RwLaunchpadYang,
RwBaseYang
)
RwLaunchpadYang,
RwBaseYang
)
@@
-99,7
+99,7
@@
def create_nsr(nsd, input_param_list, cloud_account_name):
Return:
NSR object
"""
Return:
NSR object
"""
- nsr = RwNsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr()
+ nsr = RwNsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = rift.auto.mano.resource_name(nsr.id)
nsr.id = str(uuid.uuid4())
nsr.name = rift.auto.mano.resource_name(nsr.id)
@@
-333,11
+333,11
@@
class TestNsrStart(object):
nsd = catalog.nsd[0]
input_parameters = []
nsd = catalog.nsd[0]
input_parameters = []
- descr_xpath = "/
nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/
nsd:description" % nsd.id
+ descr_xpath = "/
rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id='%s']/project-
nsd:description" % nsd.id
descr_value = "New NSD Description"
in_param_id = str(uuid.uuid4())
descr_value = "New NSD Description"
in_param_id = str(uuid.uuid4())
- input_param_1 = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr_InputParameter(
+ input_param_1 = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr_InputParameter(
xpath=descr_xpath,
value=descr_value)
xpath=descr_xpath,
value=descr_value)