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 OSM SO master
[osm/SO.git]
/
rwlaunchpad
/
ra
/
pytest
/
multivm_vnf
/
test_multi_vm_vnf_trafgen.py
diff --git
a/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py
b/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py
index
ca6e9b5
..
ae9f404
100755
(executable)
--- a/
rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py
+++ b/
rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py
@@
-33,12
+33,12
@@
import time
import uuid
from gi.repository import (
import uuid
from gi.repository import (
- NsdYang,
+
ProjectNsdYang as
NsdYang,
NsrYang,
RwNsrYang,
VnfrYang,
VldYang,
NsrYang,
RwNsrYang,
VnfrYang,
VldYang,
- RwVnfdYang,
+ Rw
ProjectVnfdYang as Rw
VnfdYang,
RwLaunchpadYang,
RwBaseYang
)
RwLaunchpadYang,
RwBaseYang
)
@@
-78,7
+78,7
@@
def create_nsr(nsd_id, 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)
@@
-206,11
+206,11
@@
class TestMultiVmVnfTrafgenApp(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)