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():
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 = ocloud.DeploymentManagerProfileSOL018
- 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
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
# 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):
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()
+ apibase = config.get_o2ims_api_base() + '/v1'
# TODO: workaround for sqlalchemy not mapping with resource object
setattr(ocloud.Resource, 'resourcePoolId', '')
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 = {}
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