projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix unittests
[osm/SO.git]
/
rwlaunchpad
/
test
/
pytest
/
lp_kt_utm_wims_test.py
diff --git
a/rwlaunchpad/test/pytest/lp_kt_utm_wims_test.py
b/rwlaunchpad/test/pytest/lp_kt_utm_wims_test.py
index
705565b
..
9b2fa8e
100644
(file)
--- a/
rwlaunchpad/test/pytest/lp_kt_utm_wims_test.py
+++ b/
rwlaunchpad/test/pytest/lp_kt_utm_wims_test.py
@@
-1,7
+1,7
@@
#!/usr/bin/env python
"""
#
#!/usr/bin/env python
"""
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016
-2017
RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-39,13
+39,13
@@
gi.require_version('RwCloudYang', '1.0')
gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwNsmYang', '1.0')
gi.require_version('RwNsrYang', '1.0')
gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwNsmYang', '1.0')
gi.require_version('RwNsrYang', '1.0')
-gi.require_version('
RwNsr
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,
)
@@
-223,7
+223,7
@@
def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600,
raise DescriptorOnboardError(state)
def create_nsr_from_nsd_id(nsd_id):
raise DescriptorOnboardError(state)
def create_nsr_from_nsd_id(nsd_id):
- nsr = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr()
+ nsr = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "UTM-WIMS"
nsr.short_name = "UTM-WIMS"
nsr.id = str(uuid.uuid4())
nsr.name = "UTM-WIMS"
nsr.short_name = "UTM-WIMS"
@@
-261,7
+261,7
@@
class TestLaunchpadStartStop(object):
cloud_account.openstack.tenant = 'demo'
cloud_account.openstack.mgmt_network = 'private'
cloud_account.openstack.tenant = 'demo'
cloud_account.openstack.mgmt_network = 'private'
- cloud_proxy.merge_config("/rw-cloud:cloud-account", cloud_account)
+ cloud_proxy.merge_config("/rw-
project:project/rw-
cloud:cloud-account", cloud_account)
def test_configure_pools(self, resource_mgr_proxy):
pools = RwResourceMgrYang.ResourcePools.from_dict({
def test_configure_pools(self, resource_mgr_proxy):
pools = RwResourceMgrYang.ResourcePools.from_dict({
@@
-272,14
+272,14
@@
class TestLaunchpadStartStop(object):
"resource_type": "network",
"pool_type" : "dynamic",}]})
"resource_type": "network",
"pool_type" : "dynamic",}]})
- resource_mgr_proxy.merge_config('/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
+ resource_mgr_proxy.merge_config('/rw-
project:project/rw-
resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
def test_configure_resource_orchestrator(self, so_proxy):
cfg = RwConmanYang.RoEndpoint.from_dict({'ro_ip_address': '127.0.0.1',
'ro_port' : 2022,
'ro_username' : 'admin',
'ro_password' : 'admin'})
def test_configure_resource_orchestrator(self, so_proxy):
cfg = RwConmanYang.RoEndpoint.from_dict({'ro_ip_address': '127.0.0.1',
'ro_port' : 2022,
'ro_username' : 'admin',
'ro_password' : 'admin'})
- so_proxy.merge_config('/rw-conman:cm-config', cfg)
+ so_proxy.merge_config('/rw-
project:project/rw-
conman:cm-config', cfg)
def test_configure_service_orchestrator(self, nsm_proxy):
cfg = RwNsmYang.SoEndpoint.from_dict({'cm_ip_address': '127.0.0.1',
def test_configure_service_orchestrator(self, nsm_proxy):
cfg = RwNsmYang.SoEndpoint.from_dict({'cm_ip_address': '127.0.0.1',