Skip to content

Commit

Permalink
mgr/dashboard: dashboard help command showing wrong syntax for login-…
Browse files Browse the repository at this point in the history
…banner

Signed-off-by: Sarthak0702 <[email protected]>
  • Loading branch information
Sarthak0702 committed Jun 21, 2022
1 parent e47dfb0 commit 826741f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 36 deletions.
3 changes: 1 addition & 2 deletions src/pybind/mgr/dashboard/controllers/home.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from cherrypy.lib.static import serve_file

from .. import mgr
from ..services.custom_banner import get_login_banner_mgr
from . import BaseController, Endpoint, Proxy, Router, UIRouter

logger = logging.getLogger("controllers.home")
Expand Down Expand Up @@ -146,4 +145,4 @@ def __call__(self):
class LoginController(BaseController):
@Endpoint('GET', 'custom_banner')
def __call__(self):
return get_login_banner_mgr()
return mgr.get_store('custom_login_banner')
20 changes: 13 additions & 7 deletions src/pybind/mgr/dashboard/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
import time
from typing import TYPE_CHECKING, Optional

from .services.custom_banner import get_login_banner_mgr, \
set_login_banner_mgr, unset_login_banner_mgr

if TYPE_CHECKING:
if sys.version_info >= (3, 8):
from typing import Literal
Expand Down Expand Up @@ -421,27 +418,36 @@ def set_rgw_credentials(self):
return 0, 'RGW credentials configured', ''

@CLIWriteCommand("dashboard set-login-banner")
def set_login_banner(self, mgr_id: Optional[str] = None, inbuf: Optional[str] = None):
def set_login_banner(self, inbuf: str):
'''
Set the custom login banner read from -i <file>
'''
item_label = 'login banner file'
if inbuf is None:
return HandleCommandResult(
-errno.EINVAL,
stderr=f'Please specify the {item_label} with "-i" option'
)
set_login_banner_mgr(inbuf, mgr_id)
mgr.set_store('custom_login_banner', inbuf)
return HandleCommandResult(stdout=f'{item_label} added')

@CLIReadCommand("dashboard get-login-banner")
def get_login_banner(self):
banner_text = get_login_banner_mgr()
'''
Get the custom login banner text
'''
banner_text = mgr.get_store('custom_login_banner')
if banner_text is None:
return HandleCommandResult(stdout='No login banner set')
else:
return HandleCommandResult(stdout=banner_text)

@CLIWriteCommand("dashboard unset-login-banner")
def unset_login_banner(self):
unset_login_banner_mgr()
'''
Unset the custom login banner
'''
mgr.set_store('custom_login_banner', None)
return HandleCommandResult(stdout='Login banner removed')

def handle_command(self, inbuf, cmd):
Expand Down
27 changes: 0 additions & 27 deletions src/pybind/mgr/dashboard/services/custom_banner.py

This file was deleted.

0 comments on commit 826741f

Please sign in to comment.