projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
[osm/SO.git]
/
rwlaunchpad
/
ra
/
pytest
/
multivm_vnf
/
conftest.py
diff --git
a/rwlaunchpad/ra/pytest/multivm_vnf/conftest.py
b/rwlaunchpad/ra/pytest/multivm_vnf/conftest.py
index
a3c565b
..
b8dcf6c
100644
(file)
--- a/
rwlaunchpad/ra/pytest/multivm_vnf/conftest.py
+++ b/
rwlaunchpad/ra/pytest/multivm_vnf/conftest.py
@@
-1,5
+1,5
@@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@
-23,13
+23,13
@@
import subprocess
import tempfile
from gi.repository import (
import tempfile
from gi.repository import (
- NsdYang,
+
ProjectNsdYang as
NsdYang,
NsrYang,
RwNsrYang,
RwVnfrYang,
VnfrYang,
VldYang,
NsrYang,
RwNsrYang,
RwVnfrYang,
VnfrYang,
VldYang,
- RwVnfdYang,
+ Rw
ProjectVnfdYang as Rw
VnfdYang,
RwLaunchpadYang,
RwBaseYang
)
RwLaunchpadYang,
RwBaseYang
)