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
Update SMO register process; remove provision code
[pti/o2.git]
/
o2ims
/
views
/
ocloud_route.py
diff --git
a/o2ims/views/ocloud_route.py
b/o2ims/views/ocloud_route.py
index
00fe520
..
6b6a3fc
100644
(file)
--- a/
o2ims/views/ocloud_route.py
+++ b/
o2ims/views/ocloud_route.py
@@
-12,8
+12,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-from flask_restx import Resource
-from flask_restx import reqparse
+from flask_restx import Resource, reqparse
from o2common.service.messagebus import MessageBus
from o2ims.views import ocloud_view
from o2common.service.messagebus import MessageBus
from o2ims.views import ocloud_view
@@
-128,6
+127,9
@@
class ResourcesListRouter(Resource):
kwargs['resourceTypeName'] = args.resourceTypeName
if args.parentId is not None:
kwargs['parentId'] = args.parentId
kwargs['resourceTypeName'] = args.resourceTypeName
if args.parentId is not None:
kwargs['parentId'] = args.parentId
+ if args.parentId.lower() == 'null':
+ kwargs['parentId'] = None
+
return ocloud_view.resources(resourcePoolID, bus.uow, **kwargs)
return ocloud_view.resources(resourcePoolID, bus.uow, **kwargs)
@@
-156,7
+158,7
@@
class ResourceGetRouter(Resource):
@api_ims_inventory_v1.route("/deploymentManagers")
class DeploymentManagersListRouter(Resource):
@api_ims_inventory_v1.route("/deploymentManagers")
class DeploymentManagersListRouter(Resource):
- model = DeploymentManagerDTO.deployment_manager_
ge
t
+ model = DeploymentManagerDTO.deployment_manager_
lis
t
@api_ims_inventory_v1.marshal_list_with(model)
def get(self):
@api_ims_inventory_v1.marshal_list_with(model)
def get(self):
@@
-166,6
+168,8
@@
class DeploymentManagersListRouter(Resource):
@api_ims_inventory_v1.route("/deploymentManagers/<deploymentManagerID>")
@api_ims_inventory_v1.param('deploymentManagerID',
'ID of the deployment manager')
@api_ims_inventory_v1.route("/deploymentManagers/<deploymentManagerID>")
@api_ims_inventory_v1.param('deploymentManagerID',
'ID of the deployment manager')
+@api_ims_inventory_v1.param('profile', 'DMS profile: value supports "sol018"',
+ _in='query')
@api_ims_inventory_v1.response(404, 'Deployment manager not found')
class DeploymentManagerGetRouter(Resource):
@api_ims_inventory_v1.response(404, 'Deployment manager not found')
class DeploymentManagerGetRouter(Resource):
@@
-174,8
+178,14
@@
class DeploymentManagerGetRouter(Resource):
@api_ims_inventory_v1.doc('Get deployment manager')
@api_ims_inventory_v1.marshal_with(model)
def get(self, deploymentManagerID):
@api_ims_inventory_v1.doc('Get deployment manager')
@api_ims_inventory_v1.marshal_with(model)
def get(self, deploymentManagerID):
+ parser = reqparse.RequestParser()
+ parser.add_argument('profile', location='args')
+ args = parser.parse_args()
+ profile = (
+ args.profile if args.profile is not None and args.profile != ''
+ else 'default')
result = ocloud_view.deployment_manager_one(
result = ocloud_view.deployment_manager_one(
- deploymentManagerID, bus.uow)
+ deploymentManagerID, bus.uow
, profile
)
if result is not None:
return result
api_ims_inventory_v1.abort(
if result is not None:
return result
api_ims_inventory_v1.abort(