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
/
haproxy
/
test_scaling.py
diff --git
a/rwlaunchpad/ra/pytest/ns/haproxy/test_scaling.py
b/rwlaunchpad/ra/pytest/ns/haproxy/test_scaling.py
index
846ef2e
..
8e203d9
100644
(file)
--- a/
rwlaunchpad/ra/pytest/ns/haproxy/test_scaling.py
+++ b/
rwlaunchpad/ra/pytest/ns/haproxy/test_scaling.py
@@
-17,7
+17,13
@@
import pytest
import pytest
-from gi.repository import NsrYang, RwNsrYang, RwVnfrYang, NsdYang, RwNsdYang
+from gi.repository import (
+ NsrYang,
+ RwNsrYang,
+ RwVnfrYang,
+ ProjectNsdYang as NsdYang,
+ RwProjectNsdYang as RwNsdYang
+ )
import rift.auto.session
@pytest.fixture(scope='module')
import rift.auto.session
@pytest.fixture(scope='module')
@@
-25,8
+31,8
@@
def proxy(request, mgmt_session):
return mgmt_session.proxy
return mgmt_session.proxy
-ScalingGroupInstance = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr_ScalingGroup_Instance
-ScalingGroup = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr_ScalingGroup
+ScalingGroupInstance = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr_ScalingGroup_Instance
+ScalingGroup = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr_ScalingGroup
INSTANCE_ID = 1
INSTANCE_ID = 1