X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tests%2Funit%2Ftest_ocloud.py;h=18c16cb63ce692d8883724b90f653a4dd2a06d84;hb=HEAD;hp=461fa41a68cbf906269a6de8a0f232f920a41797;hpb=ad15ec6b732868c3ecedb9cd84450462bafa3320;p=pti%2Fo2.git diff --git a/tests/unit/test_ocloud.py b/tests/unit/test_ocloud.py index 461fa41..18c16cb 100644 --- a/tests/unit/test_ocloud.py +++ b/tests/unit/test_ocloud.py @@ -14,12 +14,11 @@ import uuid from unittest.mock import MagicMock -from o2dms.domain import dms -from o2ims.domain import ocloud, subscription_obj, configuration_obj +from o2ims.domain import ocloud, subscription_obj from o2ims.domain import resource_type as rt from o2ims.views import ocloud_view -from o2common.config import config +from o2common.config import config, conf as CONF def setup_ocloud(): @@ -95,15 +94,6 @@ def test_new_subscription(): subscription1.subscriptionId == subscription_id1 -def test_new_configuration(): - configuration_id1 = str(uuid.uuid4()) - configuration1 = configuration_obj.Configuration( - configuration_id1, "https://callback/uri/write/here", - "SMO") - assert configuration_id1 is not None and\ - configuration1.configurationId == configuration_id1 - - def test_view_olcouds(mock_uow): session, uow = mock_uow @@ -111,7 +101,8 @@ def test_view_olcouds(mock_uow): ocloud1 = MagicMock() ocloud1.serialize.return_value = { 'oCloudId': ocloud1_UUID, 'name': 'ocloud1'} - session.return_value.query.return_value = [ocloud1] + session.return_value.query.return_value.filter.return_value.\ + order_by.return_value = [ocloud1] ocloud_list = ocloud_view.oclouds(uow) # assert str(ocloud_list[0].get("oCloudId")) == ocloud1_UUID @@ -144,11 +135,17 @@ def test_view_resource_types(mock_uow): restype1 = MagicMock() restype1.serialize.return_value = { "resourceTypeId": resource_type_id1} - session.return_value.query.return_value = [restype1] - resource_type_list = ocloud_view.resource_types(uow) - assert str(resource_type_list[0].get( - "resourceTypeId")) == resource_type_id1 + 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.return_value.\ + order_by.return_value = order_by + + result = ocloud_view.resource_types(uow) + assert result['count'] == 1 + ret_list = result['results'] + assert str(ret_list[0].get("resourceTypeId")) == resource_type_id1 def test_view_resource_type_one(mock_uow): @@ -178,11 +175,17 @@ def test_view_resource_pools(mock_uow): respool1 = MagicMock() respool1.serialize.return_value = { "resourcePoolId": resource_pool_id1} - session.return_value.query.return_value = [respool1] - resource_pool_list = ocloud_view.resource_pools(uow) - assert str(resource_pool_list[0].get( - "resourcePoolId")) == resource_pool_id1 + 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.return_value.\ + order_by.return_value = order_by + + result = ocloud_view.resource_pools(uow) + assert result['count'] == 1 + ret_list = result['results'] + assert str(ret_list[0].get("resourcePoolId")) == resource_pool_id1 def test_view_resource_pool_one(mock_uow): @@ -216,9 +219,18 @@ def test_view_resources(mock_uow): "resourceId": resource_id1, "resourcePoolId": resource_pool_id1 } - session.return_value.query.return_value.filter_by.return_value = [res1] - resource_list = ocloud_view.resources(resource_pool_id1, 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.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 + resource_list = result['results'] assert str(resource_list[0].get("resourceId")) == resource_id1 assert str(resource_list[0].get("resourcePoolId")) == resource_pool_id1 @@ -232,7 +244,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.\ @@ -240,9 +253,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): @@ -253,11 +267,18 @@ def test_view_deployment_managers(mock_uow): dm1.serialize.return_value = { "deploymentManagerId": deployment_manager_id1, } - session.return_value.query.return_value = [dm1] - deployment_manager_list = ocloud_view.deployment_managers(uow) - assert str(deployment_manager_list[0].get( - "deploymentManagerId")) == deployment_manager_id1 + 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.return_value.\ + order_by.return_value = order_by + + result = ocloud_view.deployment_managers(uow) + assert result['count'] == 1 + ret_list = result['results'] + assert str(ret_list[0].get("deploymentManagerId") + ) == deployment_manager_id1 def test_view_deployment_manager_one(mock_uow): @@ -276,22 +297,28 @@ 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, - "deploymentManagementServiceEndpoint": dms_endpoint, + "serviceUri": dms_endpoint, "profile": {} } + CONF.API.DMS_SUPPORT_PROFILES = 'native_k8sapi,sol018,sol018_helmcli' + cluster_endpoint = "https://test_k8s:6443" + session.return_value.query.return_value.filter_by.return_value.first.\ + return_value.serialize.return_value['profile'] = { + "cluster_api_endpoint": cluster_endpoint + } + # profile default deployment_manager_res = ocloud_view.deployment_manager_one( deployment_manager_id1, uow) assert str(deployment_manager_res.get( "deploymentManagerId")) == deployment_manager_id1 assert str(deployment_manager_res.get( - 'deploymentManagementServiceEndpoint')) == dms_endpoint + 'serviceUri')) == cluster_endpoint assert deployment_manager_res.get('profile') is None # profile sol018 - profileName = 'sol018' - cluster_endpoint = "https://test_k8s:6443" + profileName = ocloud.DeploymentManagerProfileSOL018 session.return_value.query.return_value.filter_by.return_value.first.\ return_value.serialize.return_value['profile'] = { "cluster_api_endpoint": cluster_endpoint @@ -299,19 +326,15 @@ 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( - 'deploymentManagementServiceEndpoint')) == cluster_endpoint - assert str(deployment_manager_res.get( + 'serviceUri')) == cluster_endpoint + assert str(deployment_manager_res.get("extensions").get( "profileName")) == profileName # profile wrong name profileName = 'wrong_profile' - session.return_value.query.return_value.filter_by.return_value.first.\ - return_value.serialize.return_value['profile'] = { - "cluster_api_endpoint": cluster_endpoint - } deployment_manager_res = ocloud_view.deployment_manager_one( deployment_manager_id1, uow, profile=profileName) - assert deployment_manager_res is None + assert deployment_manager_res == "" def test_view_subscriptions(mock_uow): @@ -322,11 +345,17 @@ def test_view_subscriptions(mock_uow): sub1.serialize.return_value = { "subscriptionId": subscription_id1, } - session.return_value.query.return_value = [sub1] - subscription_list = ocloud_view.subscriptions(uow) - assert str(subscription_list[0].get( - "subscriptionId")) == subscription_id1 + 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.return_value.\ + order_by.return_value = order_by + + result = ocloud_view.subscriptions(uow) + assert result['count'] == 1 + ret_list = result['results'] + assert str(ret_list[0].get("subscriptionId")) == subscription_id1 def test_view_subscription_one(mock_uow): @@ -354,8 +383,14 @@ def test_view_subscription_one(mock_uow): def test_flask_get_list(mock_flask_uow): session, app = mock_flask_uow - session.query.return_value = [] - apibase = config.get_o2ims_api_base() + 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 + 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 @@ -383,7 +418,7 @@ def test_flask_get_one(mock_flask_uow): 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 @@ -414,9 +449,15 @@ 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() + 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 = [] @@ -425,7 +466,7 @@ def test_flask_post(mock_flask_uow): resp = client.post(apibase+'/subscriptions', json={ 'callback': sub_callback, 'consumerSubscriptionId': 'consumerSubId1', - 'filter': 'empty' + 'filter': '(eq,resourceTypeId,xxx)' }) assert resp.status_code == 201 assert 'subscriptionId' in resp.get_json() @@ -433,19 +474,19 @@ def test_flask_post(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 = {} subscription_id1 = str(uuid.uuid4()) resp = client.delete(apibase+"/subscriptions/"+subscription_id1) - assert resp.status_code == 204 + assert resp.status_code == 200 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