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
Rename ssl related files and variable names to make it more clear.
[pti/o2.git]
/
tests
/
unit
/
test_ocloud.py
diff --git
a/tests/unit/test_ocloud.py
b/tests/unit/test_ocloud.py
index
8be1e42
..
a3c0f67
100644
(file)
--- a/
tests/unit/test_ocloud.py
+++ b/
tests/unit/test_ocloud.py
@@
-138,7
+138,7
@@
def test_view_resource_types(mock_uow):
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [restype1]
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.return_value = order_by
result = ocloud_view.resource_types(uow)
@@
-178,7
+178,7
@@
def test_view_resource_pools(mock_uow):
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [respool1]
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.return_value = order_by
result = ocloud_view.resource_pools(uow)
@@
-222,8
+222,10
@@
def test_view_resources(mock_uow):
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [res1]
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
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
result = ocloud_view.resources(resource_pool_id1, uow)
assert result['count'] == 1
@@
-266,7
+268,7
@@
def test_view_deployment_managers(mock_uow):
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [dm1]
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)
order_by.return_value = order_by
result = ocloud_view.deployment_managers(uow)
@@
-292,7
+294,7
@@
def test_view_deployment_manager_one(mock_uow):
session.return_value.query.return_value.filter_by.return_value.first.\
return_value.serialize.return_value = {
"deploymentManagerId": deployment_manager_id1,
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": {}
}
"profile": {}
}
@@
-302,7
+304,7
@@
def test_view_deployment_manager_one(mock_uow):
assert str(deployment_manager_res.get(
"deploymentManagerId")) == deployment_manager_id1
assert str(deployment_manager_res.get(
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
assert deployment_manager_res.get('profile') is None
# profile sol018
@@
-315,7
+317,7
@@
def test_view_deployment_manager_one(mock_uow):
deployment_manager_res = ocloud_view.deployment_manager_one(
deployment_manager_id1, uow, profile=profileName)
assert str(deployment_manager_res.get(
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
assert str(deployment_manager_res.get(
"profileName")) == profileName
@@
-342,7
+344,7
@@
def test_view_subscriptions(mock_uow):
order_by = MagicMock()
order_by.count.return_value = 1
order_by.limit.return_value.offset.return_value = [sub1]
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.return_value = order_by
result = ocloud_view.subscriptions(uow)
@@
-379,9
+381,11
@@
def test_flask_get_list(mock_flask_uow):
order_by = MagicMock()
order_by.count.return_value = 0
order_by.limit.return_value.offset.return_value = []
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
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
with app.test_client() as client:
# Get list and return empty list
@@
-409,7
+413,7
@@
def test_flask_get_one(mock_flask_uow):
session.return_value.query.return_value.filter_by.return_value.\
first.return_value = None
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
with app.test_client() as client:
# Get one and return 404
@@
-442,7
+446,7
@@
def test_flask_get_one(mock_flask_uow):
def test_flask_post(mock_flask_uow):
session, app = mock_flask_uow
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 = []
with app.test_client() as client:
session.return_value.execute.return_value = []
@@
-459,7
+463,7
@@
def test_flask_post(mock_flask_uow):
def test_flask_delete(mock_flask_uow):
session, app = mock_flask_uow
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 = {}
with app.test_client() as client:
session.return_value.execute.return_value.first.return_value = {}
@@
-471,7
+475,7
@@
def test_flask_delete(mock_flask_uow):
def test_flask_not_allowed(mock_flask_uow):
_, app = mock_flask_uow
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
with app.test_client() as client:
# Testing resource type not support method