Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vfclcm upgrade from python2 to python3
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
nf
/
tests
/
const.py
diff --git
a/lcm/lcm/nf/tests/const.py
b/lcm/lcm/nf/tests/const.py
index
46b608b
..
7debe6b
100644
(file)
--- a/
lcm/lcm/nf/tests/const.py
+++ b/
lcm/lcm/nf/tests/const.py
@@
-125,17
+125,17
@@
inst_req_data = {
vnfd_model_dict = {
'metadata': {
vnfd_model_dict = {
'metadata': {
- 'vendor':
u
'zte',
+ 'vendor': 'zte',
'is_shared': False,
'description': '',
'is_shared': False,
'description': '',
- 'domain_type':
u
'CN',
- 'version':
u
'v4.14.10',
+ 'domain_type': 'CN',
+ 'version': 'v4.14.10',
'vmnumber_overquota_alarm': False,
'cross_dc': False,
'vmnumber_overquota_alarm': False,
'cross_dc': False,
- 'vnf_type':
u
'SSS',
- 'vnfd_version':
u
'V00000001',
- 'id':
u
'sss-vnf-template',
- 'name':
u
'sss-vnf-template'
+ 'vnf_type': 'SSS',
+ 'vnfd_version': 'V00000001',
+ 'id': 'sss-vnf-template',
+ 'name': 'sss-vnf-template'
},
'vdus': [
{
},
'vdus': [
{
@@
-182,7
+182,7
@@
vnfd_model_dict = {
"inner_hugepage_size": "2048",
"action": "add"
},
"inner_hugepage_size": "2048",
"action": "add"
},
- "image_file":
u
'sss',
+ "image_file": 'sss',
"local_storages": [
"local_storage_id1",
"local_storage_id2"
"local_storages": [
"local_storage_id1",
"local_storage_id2"
@@
-304,7
+304,7
@@
vnfd_model_dict = {
'targets': {
},
'targets': {
},
- 'policy_id':
u
'policy_scale_sss-vnf-template',
+ 'policy_id': 'policy_scale_sss-vnf-template',
'properties': {
'policy_file': '*-vnfd.zip/*-vnf-policy.xml'
},
'properties': {
'policy_file': '*-vnfd.zip/*-vnf-policy.xml'
},
@@
-315,28
+315,28
@@
vnfd_model_dict = {
{
'description': '',
'properties': {
{
'description': '',
'properties': {
- 'name':
u
'opencos_sss_omm_img_release_20150723-1-disk1.vmdk',
+ 'name': 'opencos_sss_omm_img_release_20150723-1-disk1.vmdk',
'checksum': '',
'checksum': '',
- 'disk_format':
u
'VMDK',
- 'file_url':
u
'./zte-cn-sss-main-image/OMM/opencos_sss_omm_img_release_20150723-1-disk1.vmdk',
+ 'disk_format': 'VMDK',
+ 'file_url': './zte-cn-sss-main-image/OMM/opencos_sss_omm_img_release_20150723-1-disk1.vmdk',
'container_type': 'vm',
'version': '',
'hypervisor_type': 'kvm'
},
'container_type': 'vm',
'version': '',
'hypervisor_type': 'kvm'
},
- 'image_file_id':
u
'opencos_sss_omm_img_release_20150723-1-disk1'
+ 'image_file_id': 'opencos_sss_omm_img_release_20150723-1-disk1'
},
{
'description': '',
'properties': {
},
{
'description': '',
'properties': {
- 'name':
u
'sss.vmdk',
+ 'name': 'sss.vmdk',
'checksum': '',
'checksum': '',
- 'disk_format':
u
'VMDK',
- 'file_url':
u
'./zte-cn-sss-main-image/NE/sss.vmdk',
+ 'disk_format': 'VMDK',
+ 'file_url': './zte-cn-sss-main-image/NE/sss.vmdk',
'container_type': 'vm',
'version': '',
'hypervisor_type': 'kvm'
},
'container_type': 'vm',
'version': '',
'hypervisor_type': 'kvm'
},
- 'image_file_id':
u
'sss'
+ 'image_file_id': 'sss'
}
],
'vls': [
}
],
'vls': [
@@
-567,7
+567,7
@@
c8_data_list_image = {
"status": "active",
"id": "5e2757c1-f846-4727-915c-9a872553ed75",
"size": 862016,
"status": "active",
"id": "5e2757c1-f846-4727-915c-9a872553ed75",
"size": 862016,
- "name":
u
'sss.vmdk'
+ "name": 'sss.vmdk'
}
]
}
}
]
}