openstack/os-ken
Code Issues Proposed changes

manager: Introduce user flags option

Browse Source 
This patch introduces "--user-flags" option which enable to add user
original CLI or config file options for their own Ryu applications.

Usage Example)
  $ cat user_flags.py
  from ryu import cfg

  CONF = cfg.CONF
  CONF.register_cli_opts([
      cfg.StrOpt(
          'user-cli-opt', default=None,
          help='user original CLI option'),
  ])

  $ ryu-manager --user-flags user_flags.py user_app.py

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWASE Yusuke 2017-06-15 14:31:29 +09:00 committed by FUJITA Tomonori
parent 0f1430edfd
commit 388a97ef6d
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ryu/cmd/manager.py
View File

@ -16,6 +16,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import os
import sys
from ryu.lib import hub from ryu.lib import hub
hub.patch(thread=False) hub.patch(thread=False)
@ -43,10 +46,28 @@ CONF.register_cli_opts([
cfg.BoolOpt('enable-debugger', default=False, cfg.BoolOpt('enable-debugger', default=False,
help='don\'t overwrite Python standard threading library' help='don\'t overwrite Python standard threading library'
'(use only for debugging)'), '(use only for debugging)'),
cfg.StrOpt('user-flags', default=None,
help='Additional flags file for user applications'),
]) ])
def _parse_user_flags():
"""
Parses user-flags file and loads it to register user defined options.
"""
try:
idx = list(sys.argv).index('--user-flags')
user_flags_file = sys.argv[idx + 1]
except (ValueError, IndexError):
user_flags_file = ''
if user_flags_file and os.path.isfile(user_flags_file):
from ryu.utils import _import_module_file
_import_module_file(user_flags_file)
def main(args=None, prog=None): def main(args=None, prog=None):
_parse_user_flags()
try: try:
CONF(args=args, prog=prog, CONF(args=args, prog=prog,
project='ryu', version='ryu-manager %s' % version, project='ryu', version='ryu-manager %s' % version,
@ -65,7 +86,6 @@ def main(args=None, prog=None):
hub.patch(thread=True) hub.patch(thread=True)
if CONF.pid_file: if CONF.pid_file:
import os
with open(CONF.pid_file, 'w') as pid_file: with open(CONF.pid_file, 'w') as pid_file:
pid_file.write(str(os.getpid())) pid_file.write(str(os.getpid()))