order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [restype1]
- session.return_value.query.return_value.filter_by.return_value.\
+ session.return_value.query.return_value.filter.return_value.\
order_by.return_value = order_by
result = ocloud_view.resource_types(uow)
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [respool1]
- session.return_value.query.return_value.filter_by.return_value.\
+ session.return_value.query.return_value.filter.return_value.\
order_by.return_value = order_by
result = ocloud_view.resource_pools(uow)
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [res1]
- session.return_value.query.return_value.filter_by.return_value.\
+ session.return_value.query.return_value.filter.return_value.\
order_by.return_value = order_by
+ # TODO: workaround for sqlalchemy not mapping with resource object
+ setattr(ocloud.Resource, 'resourcePoolId', '')
result = ocloud_view.resources(resource_pool_id1, uow)
assert result['count'] == 1
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [dm1]
- session.return_value.query.return_value.filter_by.return_value.\
+ session.return_value.query.return_value.filter.return_value.\
order_by.return_value = order_by
result = ocloud_view.deployment_managers(uow)
session.return_value.query.return_value.filter_by.return_value.first.\
return_value.serialize.return_value = {
"deploymentManagerId": deployment_manager_id1,
- "deploymentManagementServiceEndpoint": dms_endpoint,
+ "serviceUri": dms_endpoint,
"profile": {}
}
assert str(deployment_manager_res.get(
"deploymentManagerId")) == deployment_manager_id1
assert str(deployment_manager_res.get(
- 'deploymentManagementServiceEndpoint')) == dms_endpoint
+ 'serviceUri')) == dms_endpoint
assert deployment_manager_res.get('profile') is None
# profile sol018
deployment_manager_res = ocloud_view.deployment_manager_one(
deployment_manager_id1, uow, profile=profileName)
assert str(deployment_manager_res.get(
- 'deploymentManagementServiceEndpoint')) == cluster_endpoint
+ 'serviceUri')) == cluster_endpoint
assert str(deployment_manager_res.get(
"profileName")) == profileName
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [sub1]
- session.return_value.query.return_value.filter_by.return_value.\
+ session.return_value.query.return_value.filter.return_value.\
order_by.return_value = order_by
result = ocloud_view.subscriptions(uow)
order_by = MagicMock()
order_by.count.return_value = 0
order_by.limit.return_value.offset.return_value = []
- session.return_value.query.return_value.filter_by.return_value.\
+ session.return_value.query.return_value.filter.return_value.\
order_by.return_value = order_by
- apibase = config.get_o2ims_api_base()
+ apibase = config.get_o2ims_api_base() + '/v1'
+ # TODO: workaround for sqlalchemy not mapping with resource object
+ setattr(ocloud.Resource, 'resourcePoolId', '')
with app.test_client() as client:
# Get list and return empty list
session.return_value.query.return_value.filter_by.return_value.\
first.return_value = None
- apibase = config.get_o2ims_api_base()
+ apibase = config.get_o2ims_api_base() + '/v1'
with app.test_client() as client:
# Get one and return 404
def test_flask_post(mock_flask_uow):
session, app = mock_flask_uow
- apibase = config.get_o2ims_api_base()
+ apibase = config.get_o2ims_api_base() + '/v1'
with app.test_client() as client:
session.return_value.execute.return_value = []
def test_flask_delete(mock_flask_uow):
session, app = mock_flask_uow
- apibase = config.get_o2ims_api_base()
+ apibase = config.get_o2ims_api_base() + '/v1'
with app.test_client() as client:
session.return_value.execute.return_value.first.return_value = {}
def test_flask_not_allowed(mock_flask_uow):
_, app = mock_flask_uow
- apibase = config.get_o2ims_api_base()
+ apibase = config.get_o2ims_api_base() + '/v1'
with app.test_client() as client:
# Testing resource type not support method