Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release pti-o2imsdms 2.0.0 image
[pti/o2.git]
/
o2ims
/
views
/
ocloud_dto.py
diff --git
a/o2ims/views/ocloud_dto.py
b/o2ims/views/ocloud_dto.py
index
0a18664
..
078064b
100644
(file)
--- a/
o2ims/views/ocloud_dto.py
+++ b/
o2ims/views/ocloud_dto.py
@@
-15,6
+15,7
@@
from flask_restx import fields
from o2ims.views.api_ns import api_ims_inventory as api_ims_inventory_v1
from flask_restx import fields
from o2ims.views.api_ns import api_ims_inventory as api_ims_inventory_v1
+from o2common.views.flask_restx_fields import Json2Dict
class OcloudDTO:
class OcloudDTO:
@@
-23,6
+24,7
@@
class OcloudDTO:
"OcloudDto",
{
'oCloudId': fields.String(required=True),
"OcloudDto",
{
'oCloudId': fields.String(required=True),
+ 'globalCloudId': fields.String,
'globalcloudId': fields.String(attribute='globalCloudId'),
'name': fields.String,
'description': fields.String,
'globalcloudId': fields.String(attribute='globalCloudId'),
'name': fields.String,
'description': fields.String,
@@
-37,7
+39,8
@@
class OcloudDTO:
# 'smoRegistrationService': fields.String
'extensions': fields.String
},
# 'smoRegistrationService': fields.String
'extensions': fields.String
},
- mask='{oCloudId,globalcloudId,name,description,serviceUri}'
+ mask='{oCloudId,globalCloudId,globalcloudId,name,description,' +\
+ 'serviceUri}'
)
)
@@
-125,7
+128,9
@@
class ResourceDTO:
'parentId': fields.String,
'description': fields.String,
# 'elements': fields.String,
'parentId': fields.String,
'description': fields.String,
# 'elements': fields.String,
- 'extensions': fields.String
+ # 'extensions': fields.String
+ 'extensions': Json2Dict(attribute='extensions')
+ # 'extensions': fields.Raw(attribute='extensions')
},
mask='{resourceId,resourcePoolId,resourceTypeId,description,parentId}'
)
},
mask='{resourceId,resourcePoolId,resourceTypeId,description,parentId}'
)
@@
-141,7
+146,9
@@
class ResourceDTO:
'parentId': fields.String,
'description': fields.String,
# 'elements': fields.String,
'parentId': fields.String,
'description': fields.String,
# 'elements': fields.String,
- 'extensions': fields.String
+ # 'extensions': fields.String
+ 'extensions': Json2Dict(attribute='extensions')
+ # 'extensions': fields.Raw(attribute='extensions')
}
if iteration_number:
resource_json_mapping['elements'] = fields.List(
}
if iteration_number:
resource_json_mapping['elements'] = fields.List(