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
Fix INF-353 fail to check duplication during creating Inventory change subscription
[pti/o2.git]
/
o2ims
/
views
/
ocloud_dto.py
diff --git
a/o2ims/views/ocloud_dto.py
b/o2ims/views/ocloud_dto.py
index
14d9873
..
2bc836d
100644
(file)
--- a/
o2ims/views/ocloud_dto.py
+++ b/
o2ims/views/ocloud_dto.py
@@
-177,6
+177,11
@@
class DeploymentManagerDTO:
'helmcli_kubeconfig': fields.String(attribute='helmcli_kubeconfig'),
})
'helmcli_kubeconfig': fields.String(attribute='helmcli_kubeconfig'),
})
+ extensions = api_ims_inventory_v1.model("DeploymentManagerExtensions", {
+ 'profileName': fields.String,
+ 'profileData': fields.Nested(profile, False, True),
+ })
+
deployment_manager_get = api_ims_inventory_v1.model(
"DeploymentManagerGetDto",
{
deployment_manager_get = api_ims_inventory_v1.model(
"DeploymentManagerGetDto",
{
@@
-192,12
+197,10
@@
class DeploymentManagerDTO:
# 'supportedLocations': fields.String,
# 'capabilities': fields.String,
# 'capacity': fields.String,
# 'supportedLocations': fields.String,
# 'capabilities': fields.String,
# 'capacity': fields.String,
- 'profileName': fields.String,
- 'profileData': fields.Nested(profile, False, True),
- 'extensions': fields.String
+ 'extensions': fields.Nested(extensions, True, True)
},
mask='{deploymentManagerId,name,description,oCloudId,serviceUri,' +\
},
mask='{deploymentManagerId,name,description,oCloudId,serviceUri,' +\
- '
profileName,
profileData}'
+ '
extensions/profileName,extensions/
profileData}'
)
)
@@
-215,7
+218,7
@@
class SubscriptionDTO:
mask='{subscriptionId,callback}'
)
mask='{subscriptionId,callback}'
)
- subscription = api_ims_inventory_v1.model(
+ subscription
_create
= api_ims_inventory_v1.model(
"SubscriptionCreateDto",
{
'callback': fields.String(
"SubscriptionCreateDto",
{
'callback': fields.String(
@@
-224,11
+227,3
@@
class SubscriptionDTO:
'filter': fields.String,
}
)
'filter': fields.String,
}
)
-
- subscription_post_resp = api_ims_inventory_v1.model(
- "SubscriptionCreatedRespDto",
- {
- 'subscriptionId': fields.String(required=True,
- description='Subscription ID'),
- }
- )