diff --git a/distributedcloud/dcdbsync/api/controllers/v1/identity/identity.py b/distributedcloud/dcdbsync/api/controllers/v1/identity/identity.py index afd0dac18..8bbd6ca98 100644 --- a/distributedcloud/dcdbsync/api/controllers/v1/identity/identity.py +++ b/distributedcloud/dcdbsync/api/controllers/v1/identity/identity.py @@ -44,11 +44,6 @@ class UsersController(object): def __init__(self): super(UsersController, self).__init__() - # to do the version compatibility for future purpose - def _determine_version_cap(self, target): - version_cap = 1.0 - return version_cap - @expose(generic=True, template="json") def index(self): # Route the request to specific methods with parameters @@ -140,11 +135,6 @@ class GroupsController(object): def __init__(self): super(GroupsController, self).__init__() - # to do the version compatibility for future purpose - def _determine_version_cap(self, target): - version_cap = 1.0 - return version_cap - @expose(generic=True, template="json") def index(self): # Route the request to specific methods with parameters diff --git a/distributedcloud/dcdbsync/api/controllers/v1/identity/project.py b/distributedcloud/dcdbsync/api/controllers/v1/identity/project.py index be37f30a2..ffe6b905d 100644 --- a/distributedcloud/dcdbsync/api/controllers/v1/identity/project.py +++ b/distributedcloud/dcdbsync/api/controllers/v1/identity/project.py @@ -44,11 +44,6 @@ class ProjectsController(object): def __init__(self): super(ProjectsController, self).__init__() - # to do the version compatibility for future purpose - def _determine_version_cap(self, target): - version_cap = 1.0 - return version_cap - @expose(generic=True, template="json") def index(self): # Route the request to specific methods with parameters diff --git a/distributedcloud/dcdbsync/api/controllers/v1/identity/role.py b/distributedcloud/dcdbsync/api/controllers/v1/identity/role.py index 69346e4ef..5221b51d8 100644 --- a/distributedcloud/dcdbsync/api/controllers/v1/identity/role.py +++ b/distributedcloud/dcdbsync/api/controllers/v1/identity/role.py @@ -44,11 +44,6 @@ class RolesController(object): def __init__(self): super(RolesController, self).__init__() - # to do the version compatibility for future purpose - def _determine_version_cap(self, target): - version_cap = 1.0 - return version_cap - @expose(generic=True, template="json") def index(self): # Route the request to specific methods with parameters diff --git a/distributedcloud/dcdbsync/api/controllers/v1/identity/token_revoke_event.py b/distributedcloud/dcdbsync/api/controllers/v1/identity/token_revoke_event.py index e009dcaf2..01e883866 100644 --- a/distributedcloud/dcdbsync/api/controllers/v1/identity/token_revoke_event.py +++ b/distributedcloud/dcdbsync/api/controllers/v1/identity/token_revoke_event.py @@ -45,11 +45,6 @@ class RevokeEventsController(object): def __init__(self): super(RevokeEventsController, self).__init__() - # to do the version compatibility for future purpose - def _determine_version_cap(self, target): - version_cap = 1.0 - return version_cap - @expose(generic=True, template="json") def index(self): # Route the request to specific methods with parameters diff --git a/distributedcloud/dcmanager/api/controllers/v1/subclouds.py b/distributedcloud/dcmanager/api/controllers/v1/subclouds.py index 7d347d700..dcd08da0c 100644 --- a/distributedcloud/dcmanager/api/controllers/v1/subclouds.py +++ b/distributedcloud/dcmanager/api/controllers/v1/subclouds.py @@ -23,7 +23,6 @@ import os import re from fm_api.constants import FM_ALARM_ID_UNSYNCHRONIZED_RESOURCE -import keyring from netaddr import IPNetwork from oslo_config import cfg from oslo_log import log as logging @@ -91,11 +90,6 @@ class SubcloudsController(object): self.dcmanager_rpc_client = rpc_client.ManagerClient() self.dcmanager_state_rpc_client = rpc_client.SubcloudStateClient() - # to do the version compatibility for future purpose - def _determine_version_cap(self, target): - version_cap = 1.0 - return version_cap - @expose(generic=True, template="json") def index(self): # Route the request to specific methods with parameters @@ -311,36 +305,6 @@ class SubcloudsController(object): None, ) - def _get_subcloud_users(self): - """Get the subcloud users and passwords from keyring""" - DEFAULT_SERVICE_PROJECT_NAME = "services" - # First entry is openstack user name, second entry is the user stored - # in keyring. Not sure why heat_admin uses a different keystone name. - SUBCLOUD_USERS = [ - ("sysinv", "sysinv"), - ("patching", "patching"), - ("vim", "vim"), - ("mtce", "mtce"), - ("fm", "fm"), - ("barbican", "barbican"), - ("smapi", "smapi"), - ("dcdbsync", "dcdbsync"), - ] - - user_list = list() - for user in SUBCLOUD_USERS: - password = keyring.get_password(user[1], DEFAULT_SERVICE_PROJECT_NAME) - if password: - user_dict = dict() - user_dict["name"] = user[0] - user_dict["password"] = password - user_list.append(user_dict) - else: - LOG.error("User %s not found in keyring as %s" % (user[0], user[1])) - pecan.abort(500, _("System configuration error")) - - return user_list - def _get_deploy_config_sync_status(self, context, subcloud_name, keystone_client): """Get the deploy configuration insync status of the subcloud""" detected_alarms = None diff --git a/distributedcloud/dcorch/api/controllers/v1/subcloud_manager.py b/distributedcloud/dcorch/api/controllers/v1/subcloud_manager.py index a36584955..960763b82 100644 --- a/distributedcloud/dcorch/api/controllers/v1/subcloud_manager.py +++ b/distributedcloud/dcorch/api/controllers/v1/subcloud_manager.py @@ -39,11 +39,6 @@ class SubcloudController(object): super(SubcloudController, self).__init__(*args, **kwargs) self.rpc_client = rpc_client.EngineWorkerClient() - # to do the version compatibility for future purpose - def _determine_version_cap(self, target): - version_cap = 1.0 - return version_cap - @expose(generic=True, template="json") def index(self): # Route the request to specific methods with parameters