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
/
test
/
pytest
/
lp_test.py
diff --git
a/rwlaunchpad/test/pytest/lp_test.py
b/rwlaunchpad/test/pytest/lp_test.py
index
b987b35
..
8957dfe
100644
(file)
--- a/
rwlaunchpad/test/pytest/lp_test.py
+++ b/
rwlaunchpad/test/pytest/lp_test.py
@@
-39,13
+39,13
@@
gi.require_version('RwCloudYang', '1.0')
gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwlogMgmtYang', '1.0')
gi.require_version('RwNsmYang', '1.0')
gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwlogMgmtYang', '1.0')
gi.require_version('RwNsmYang', '1.0')
-gi.require_version('
RwNsm
Yang', '1.0')
+gi.require_version('
ProjectNsd
Yang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
gi.require_version('RwConmanYang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
gi.require_version('RwConmanYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('Rw
Project
VnfdYang', '1.0')
from gi.repository import (
from gi.repository import (
- NsdYang,
+
ProjectNsdYang as
NsdYang,
NsrYang,
RwBaseYang,
RwCloudYang,
NsrYang,
RwBaseYang,
RwCloudYang,
@@
-55,7
+55,7
@@
from gi.repository import (
RwNsrYang,
RwResourceMgrYang,
RwConmanYang,
RwNsrYang,
RwResourceMgrYang,
RwConmanYang,
- RwVnfdYang,
+ Rw
ProjectVnfdYang as Rw
VnfdYang,
VldYang,
)
VldYang,
)
@@
-172,7
+172,7
@@
def ping_pong_nsd_package_file():
def create_nsr_from_nsd_id(nsd_id):
def create_nsr_from_nsd_id(nsd_id):
- nsr = RwNsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr()
+ nsr = RwNsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "pingpong_{}".format(datetime.datetime.now().strftime("%Y%m%d_%H%M%S"))
nsr.short_name = "nsr_short_name"
nsr.id = str(uuid.uuid4())
nsr.name = "pingpong_{}".format(datetime.datetime.now().strftime("%Y%m%d_%H%M%S"))
nsr.short_name = "nsr_short_name"
@@
-181,8
+181,8
@@
def create_nsr_from_nsd_id(nsd_id):
nsr.admin_status = "ENABLED"
nsr.cloud_account = "openstack"
nsr.admin_status = "ENABLED"
nsr.cloud_account = "openstack"
- param = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr_InputParameter()
- param.xpath = '/
nsd:nsd-catalog/nsd:nsd/
nsd:vendor'
+ param = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr_InputParameter()
+ param.xpath = '/
rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd/project-
nsd:vendor'
param.value = "rift-o-matic"
nsr.input_parameter.append(param)
param.value = "rift-o-matic"
nsr.input_parameter.append(param)