Merge "Fix INF-356 DC client auth token is invalid"

[pti/o2.git] / tests / unit / test_ocloud.py

diff --git a/tests/unit/test_ocloud.py b/tests/unit/test_ocloud.py
index 13a7d42..5a5ed2c 100644 (file)
--- a/tests/unit/test_ocloud.py
+++ b/tests/unit/test_ocloud.py
@@ -243,7 +243,8 @@ def test_view_resource_one(mock_uow):
         return_value.serialize.return_value = None
 
     # Query return None
-    resource_res = ocloud_view.resource_one(resource_id1, uow)
+    resource_res = ocloud_view.resource_one(
+        resource_id1, uow, resource_pool_id1)
     assert resource_res is None
 
     session.return_value.query.return_value.filter_by.return_value.first.\
@@ -251,9 +252,10 @@ def test_view_resource_one(mock_uow):
             "resourceId": resource_id1,
             "resourcePoolId": resource_pool_id1
         }
-
-    resource_res = ocloud_view.resource_one(resource_id1, uow)
-    assert str(resource_res.get("resourceId")) == resource_id1
+    resource_res = ocloud_view.resource_one(
+        resource_id1, uow, resource_pool_id1)
+    assert str(resource_res.get("resourceId") == resource_id1)
+    assert str(resource_res.get("resourcePoolId") == resource_pool_id1)
 
 
 def test_view_deployment_managers(mock_uow):
@@ -324,7 +326,7 @@ def test_view_deployment_manager_one(mock_uow):
         deployment_manager_id1, uow, profile=profileName)
     assert str(deployment_manager_res.get(
         'serviceUri')) == cluster_endpoint
-    assert str(deployment_manager_res.get(
+    assert str(deployment_manager_res.get("extensions").get(
         "profileName")) == profileName
 
     # profile wrong name
@@ -446,10 +448,16 @@ def test_flask_get_one(mock_flask_uow):
         assert resp.status_code == 404
 
 
-def test_flask_post(mock_flask_uow):
+def test_flask_post(mock_flask_uow, mappers):
     session, app = mock_flask_uow
     apibase = config.get_o2ims_api_base() + '/v1'
 
+    order_by = MagicMock()
+    order_by.count.return_value = 0
+    order_by.limit.return_value.offset.return_value = []
+    session.return_value.query.return_value.filter.return_value.\
+        order_by.return_value = order_by
+
     with app.test_client() as client:
         session.return_value.execute.return_value = []
 
@@ -457,7 +465,7 @@ def test_flask_post(mock_flask_uow):
         resp = client.post(apibase+'/subscriptions', json={
             'callback': sub_callback,
             'consumerSubscriptionId': 'consumerSubId1',
-            'filter': ''
+            'filter': '(eq,resourceTypeId,xxx)'
         })
         assert resp.status_code == 201
         assert 'subscriptionId' in resp.get_json()