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]
/
common
/
python
/
rift
/
mano
/
config_data
/
test
/
test_converter.py
diff --git
a/common/python/rift/mano/config_data/test/test_converter.py
b/common/python/rift/mano/config_data/test/test_converter.py
index
1bfd7d7
..
42521c0
100644
(file)
--- a/
common/python/rift/mano/config_data/test/test_converter.py
+++ b/
common/python/rift/mano/config_data/test/test_converter.py
@@
-17,20
+17,23
@@
import pytest
import uuid
import pytest
import uuid
-from gi.repository import NsdYang, VnfdYang
+from gi.repository import (
+ ProjectNsdYang as NsdYang,
+ ProjectVnfdYang as VnfdYang,
+ )
from ..config import ConfigPrimitiveConvertor
import yaml
@pytest.fixture(scope="function")
def nsd():
from ..config import ConfigPrimitiveConvertor
import yaml
@pytest.fixture(scope="function")
def nsd():
- catalog = NsdYang.YangData_
Nsd
_NsdCatalog()
+ catalog = NsdYang.YangData_
RwProject_Project
_NsdCatalog()
nsd = catalog.nsd.add()
nsd.id = str(uuid.uuid1())
return nsd
@pytest.fixture(scope="function")
def vnfd():
nsd = catalog.nsd.add()
nsd.id = str(uuid.uuid1())
return nsd
@pytest.fixture(scope="function")
def vnfd():
- catalog = VnfdYang.YangData_
Vnfd
_VnfdCatalog()
+ catalog = VnfdYang.YangData_
RwProject_Project
_VnfdCatalog()
vnfd = catalog.vnfd.add()
vnfd.id = str(uuid.uuid1())
return vnfd
vnfd = catalog.vnfd.add()
vnfd.id = str(uuid.uuid1())
return vnfd
@@
-222,14
+225,14
@@
def test_vnfd_config_prim(vnfd, convertor):
],
})
],
})
- vnf_config.
service
_primitive.add().from_dict({
+ vnf_config.
config
_primitive.add().from_dict({
"name": "PE1",
"parameter": [
{"name": "Foo", "default_value": "Bar"}
]
})
"name": "PE1",
"parameter": [
{"name": "Foo", "default_value": "Bar"}
]
})
- expected_yaml = """
service
_primitive:
+ expected_yaml = """
config
_primitive:
PE1:
parameter:
Foo: Bar
PE1:
parameter:
Foo: Bar
@@
-267,12
+270,12
@@
def test_vnfd_merge(vnfd, convertor):
"parameter": [{"name": "cidr"}],
})
"parameter": [{"name": "cidr"}],
})
- vnf_config.
service
_primitive.add().from_dict({
+ vnf_config.
config
_primitive.add().from_dict({
"name": "PE1",
"parameter": [{"name": "Foo",}]
})
"name": "PE1",
"parameter": [{"name": "Foo",}]
})
- ip_yaml = """
service
_primitive:
+ ip_yaml = """
config
_primitive:
PE1:
parameter:
Foo: Bar
PE1:
parameter:
Foo: Bar
@@
-287,7
+290,7
@@
initial_config_primitive:
cidr: 10.10.10.2/30
"""
cidr: 10.10.10.2/30
"""
- catalog = VnfdYang.YangData_
Vnfd
_VnfdCatalog()
+ catalog = VnfdYang.YangData_
RwProject_Project
_VnfdCatalog()
expected_vnfd = catalog.vnfd.add()
vnf_config = expected_vnfd.vnf_configuration
expected_vnfd.id = vnfd.id
expected_vnfd = catalog.vnfd.add()
vnf_config = expected_vnfd.vnf_configuration
expected_vnfd.id = vnfd.id
@@
-311,7
+314,7
@@
initial_config_primitive:
],
})
],
})
- vnf_config.
service
_primitive.add().from_dict({
+ vnf_config.
config
_primitive.add().from_dict({
"name": "PE1",
"parameter": [
{"name": "Foo", "default_value": "Bar"}
"name": "PE1",
"parameter": [
{"name": "Foo", "default_value": "Bar"}
@@
-374,7
+377,7
@@
def test_nsd_merge(nsd, convertor):
Vlan ID: '3000'
"""
Vlan ID: '3000'
"""
- catalog = NsdYang.YangData_
Nsd
_NsdCatalog()
+ catalog = NsdYang.YangData_
RwProject_Project
_NsdCatalog()
expected_nsd = catalog.nsd.add()
expected_nsd.id = nsd.id
expected_nsd.service_primitive.add().from_dict(
expected_nsd = catalog.nsd.add()
expected_nsd.id = nsd.id
expected_nsd.service_primitive.add().from_dict(