starlingx
/
ha
Code Issues Proposed changes

Merge "Add new provision/deprovison command option"

This commit is contained in:
Zuul 2019-05-02 18:14:25 +00:00 committed by Gerrit Code Review
parent b27342d6fd 778d4e2dcf
commit b91896b3cb
3 changed files with 77 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service-mgmt-tools/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
SRC_DIR=sm-tools
TAR_NAME=sm-tools
VERSION=1.0
TIS_PATCH_VER=1
TIS_PATCH_VER=2

31
service-mgmt-tools/sm-tools/sm_tools/sm_api_msg_utils.py
View File

@ -18,6 +18,9 @@ SM_API_MSG_REVISION = "1"
SM_API_MSG_TYPE_RESTART_SERVICE = "RESTART_SERVICE"
SM_API_MSG_SKIP_DEP_CHECK = "skip-dep"
SM_API_MSG_TYPE_PROVISION_SERVICE = "PROVISION_SERVICE"
SM_API_MSG_TYPE_DEPROVISION_SERVICE = "DEPROVISION_SERVICE"
SM_API_MSG_TYPE_RELOAD_DATA = "RELOAD_DATA"
SM_API_MSG_TYPE_SDI_SET_STATE = "SERVICE_DOMAIN_INTERFACE_SET_STATE"
@ -65,3 +68,31 @@ def restart_service_safe(service_name):
service_name, SM_API_MSG_SKIP_DEP_CHECK))
_send_msg_to_sm(sm_api_msg)
def provision_service(service_name, service_group_name):
"""
:param service_name:
:param service_group_name:
:return:
"""
sm_api_msg = ("%s,%s,%i,%s,%s,%s,%s"
% (SM_API_MSG_VERSION, SM_API_MSG_REVISION, 1,
SM_API_MSG_TYPE_PROVISION_SERVICE, "sm-action",
service_name, service_group_name))
_send_msg_to_sm(sm_api_msg)
def deprovision_service(service_name, service_group_name):
"""
:param service_name:
:param service_group_name:
:return:
"""
sm_api_msg = ("%s,%s,%i,%s,%s,%s,%s"
% (SM_API_MSG_VERSION, SM_API_MSG_REVISION, 1,
SM_API_MSG_TYPE_DEPROVISION_SERVICE, "sm-action",
service_name, service_group_name))
_send_msg_to_sm(sm_api_msg)

55
service-mgmt-tools/sm-tools/sm_tools/sm_provision.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2015 Wind River Systems, Inc.
# Copyright (c) 2015-2019 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -7,8 +7,23 @@ import os
import sys
import argparse
import sqlite3
from sm_api_msg_utils import provision_service
from sm_api_msg_utils import deprovision_service
database_name = "/var/lib/sm/sm.db"
runtime_db_name = "/var/run/sm/sm.db"
def update_db(db, sqls):
database = sqlite3.connect(db)
cursor = database.cursor()
for sql in sqls:
cursor.execute(sql)
database.commit()
database.close()
def main():
@ -64,6 +79,10 @@ def main():
sg_member_parser.add_argument('service_group_member',
help='service group member name')
sg_member_parser.add_argument("--apply",
help="Apply the new configuration "
"immediately\n",
action="store_true")
# Service
service_parser = subparsers.add_parser('service',
help='Provision Service')
@ -125,20 +144,36 @@ def main():
database.close()
elif args.which == 'service_group_member':
database = sqlite3.connect(database_name)
sql_update_sgm = "UPDATE SERVICE_GROUP_MEMBERS SET " \
"PROVISIONED = '%s' WHERE NAME = '%s' and " \
"SERVICE_NAME = '%s';" \
% (provision_str, args.service_group,
args.service_group_member)
sql_update_svc = "UPDATE SERVICES SET " \
"PROVISIONED = '%s' WHERE NAME = '%s';" \
% (provision_str, args.service_group_member)
cursor = database.cursor()
sqls = [sql_update_sgm, sql_update_svc]
update_db(database_name, sqls)
cursor.execute("UPDATE SERVICE_GROUP_MEMBERS SET "
"PROVISIONED = '%s' WHERE NAME = '%s' and "
"SERVICE_NAME = '%s';"
% (provision_str, args.service_group,
args.service_group_member))
if args.apply and os.path.isfile(runtime_db_name):
# update runtime configuration
update_db(runtime_db_name, sqls)
database.commit()
database.close()
# tell SM to apply changes
if "yes" == provision_str:
provision_service(args.service_group_member,
args.service_group)
elif "no" == provision_str:
deprovision_service(args.service_group_member,
args.service_group)
elif args.which == 'service':
print('%s service <service_name>\nhas been deprecated and '
'it is supported for backward compatibility.\n'
'Please use %s service-group-member <service_group> '
'<service_group_member>' % (file_name, file_name))
database = sqlite3.connect(database_name)
cursor = database.cursor()