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
Merge "Fix SqlAlchemy version upgrade issue"
[pti/o2.git]
/
o2ims
/
domain
/
ocloud.py
diff --git
a/o2ims/domain/ocloud.py
b/o2ims/domain/ocloud.py
index
4ec5840
..
ee3da89
100644
(file)
--- a/
o2ims/domain/ocloud.py
+++ b/
o2ims/domain/ocloud.py
@@
-63,6
+63,8
@@
class DeploymentManager(AgRoot, Serializer):
elif profile == DeploymentManagerProfileSOL018HelmCLI:
d['profileSupportList'].append(profile)
elif profile == DeploymentManagerProfileSOL018HelmCLI:
d['profileSupportList'].append(profile)
+ if 'capabilities' in d and d['capabilities'] != '':
+ d['capabilities'] = json.loads(d['capabilities'])
return d
return d
@@
-113,9
+115,9
@@
class ResourceType(AgRoot, Serializer):
class Resource(AgRoot, Serializer):
def __init__(self, resourceId: str, resourceTypeId: str,
class Resource(AgRoot, Serializer):
def __init__(self, resourceId: str, resourceTypeId: str,
- resourcePoolId: str,
name: str,
parentId: str = '',
+ resourcePoolId: str, parentId: str = '',
gAssetId: str = '', elements: str = '',
gAssetId: str = '', elements: str = '',
- description: str = '') -> None:
+ description: str = ''
, extensions: str = ''
) -> None:
super().__init__()
self.resourceId = resourceId
self.description = description
super().__init__()
self.resourceId = resourceId
self.description = description
@@
-123,9
+125,8
@@
class Resource(AgRoot, Serializer):
self.globalAssetId = gAssetId
self.resourcePoolId = resourcePoolId
self.elements = elements
self.globalAssetId = gAssetId
self.resourcePoolId = resourcePoolId
self.elements = elements
- self.extensions =
[]
+ self.extensions =
extensions
- self.name = name
self.parentId = parentId
self.children = []
self.parentId = parentId
self.children = []