Skip to content

Commit

Permalink
Merge " Requirement: add admin_user/admin_password conf file" into R3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed Feb 21, 2017
2 parents 3aa73d4 + 803d6f8 commit 82f8603
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 20 deletions.
44 changes: 37 additions & 7 deletions src/opserver/flow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#

import sys
import ConfigParser
import argparse
import json
import datetime
Expand Down Expand Up @@ -70,6 +71,7 @@ def __init__(self):
def run(self):
if self.parse_args() != 0:
return

result = self.query()
self.display(result)

Expand Down Expand Up @@ -98,10 +100,40 @@ def parse_args(self):
'start_time': 'now-10m',
'end_time': 'now',
'direction' : 'ingress',
'admin_user': 'admin',
'admin_password': 'contrail123',
'conf_file': '/etc/contrail/contrail-keystone-auth.conf',
}

conf_parser = argparse.ArgumentParser(add_help=False)
conf_parser.add_argument("--admin-user", help="Name of admin user")
conf_parser.add_argument("--admin-password", help="Password of admin user")
conf_parser.add_argument("--conf-file", help="Configuration file")
args, remaining_argv = conf_parser.parse_known_args();

configfile = defaults['conf_file']
if args.conf_file:
configfile = args.conf_file

config = ConfigParser.SafeConfigParser()
config.read(configfile)
if 'KEYSTONE' in config.sections():
if args.admin_user == None:
args.admin_user = config.get('KEYSTONE', 'admin_user')
if args.admin_password == None:
args.admin_password = config.get('KEYSTONE','admin_password')

if args.admin_user == None:
args.admin_user = defaults['admin_user']
if args.admin_password == None:
args.admin_password = defaults['admin_password']

parser = argparse.ArgumentParser(
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
# Inherit options from config_parser
parents=[conf_parser],
# print script description with -h/--help
description=__doc__,
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser.set_defaults(**defaults)
parser.add_argument("--analytics-api-ip",
help="IP address of Analytics API Server")
Expand Down Expand Up @@ -139,12 +171,10 @@ def parse_args(self):
help="Show vmi uuid information")
parser.add_argument(
"--verbose", action="store_true", help="Show internal information")
parser.add_argument(
"--admin-user", help="Name of admin user", default="admin")
parser.add_argument(
"--admin-password", help="Password of admin user",
default="contrail123")
self._args = parser.parse_args()
self._args = parser.parse_args(remaining_argv)

self._args.admin_user = args.admin_user
self._args.admin_password = args.admin_password

try:
self._start_time, self._end_time = \
Expand Down
41 changes: 36 additions & 5 deletions src/opserver/log.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#

import sys
import ConfigParser
import argparse
import json
import datetime
Expand Down Expand Up @@ -45,6 +46,7 @@ def run(self):
try:
if self.parse_args() != 0:
return

if self._args.tail:
start_time = UTCTimestampUsec() - 10*pow(10,6)
while True:
Expand Down Expand Up @@ -112,10 +114,40 @@ def parse_args(self):
defaults = {
'analytics_api_ip': '127.0.0.1',
'analytics_api_port': '8181',
'admin_user': 'admin',
'admin_password': 'contrail123',
'conf_file': '/etc/contrail/contrail-keystone-auth.conf',
}

conf_parser = argparse.ArgumentParser(add_help=False)
conf_parser.add_argument("--admin-user", help="Name of admin user")
conf_parser.add_argument("--admin-password", help="Password of admin user")
conf_parser.add_argument("--conf-file", help="Configuration file")
args, remaining_argv = conf_parser.parse_known_args();

configfile = defaults['conf_file']
if args.conf_file:
configfile = args.conf_file

config = ConfigParser.SafeConfigParser()
config.read(configfile)
if 'KEYSTONE' in config.sections():
if args.admin_user == None:
args.admin_user = config.get('KEYSTONE', 'admin_user')
if args.admin_password == None:
args.admin_password = config.get('KEYSTONE','admin_password')

if args.admin_user == None:
args.admin_user = defaults['admin_user']
if args.admin_password == None:
args.admin_password = defaults['admin_password']

parser = argparse.ArgumentParser(
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
# Inherit options from config_parser
parents=[conf_parser],
# print script description with -h/--help
description=__doc__,
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser.set_defaults(**defaults)
parser.add_argument("--analytics-api-ip", help="IP address of Analytics API Server")
parser.add_argument("--analytics-api-port", help="Port of Analytics API Server")
Expand Down Expand Up @@ -164,10 +196,9 @@ def parse_args(self):
parser.add_argument("--output-file", "-o", help="redirect output to file")
parser.add_argument("--json", help="Dump output as json", action="store_true")
parser.add_argument("--all", action="store_true", help=argparse.SUPPRESS)
parser.add_argument("--admin-user", help="Name of admin user", default="admin")
parser.add_argument("--admin-password", help="Password of admin user",
default="contrail123")
self._args = parser.parse_args()
self._args = parser.parse_args(remaining_argv)
self._args.admin_user = args.admin_user
self._args.admin_password = args.admin_password
return 0
# end parse_args

Expand Down
45 changes: 37 additions & 8 deletions src/opserver/stats.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#

import sys
import ConfigParser
import argparse
import json
import datetime
Expand Down Expand Up @@ -76,11 +77,41 @@ def parse_args(self):
'end_time': 'now',
'select' : [],
'where' : ['Source=*'],
'sort': []
'sort': [],
'admin_user': 'admin',
'admin_password': 'contrail123',
'conf_file': '/etc/contrail/contrail-keystone-auth.conf',
}

conf_parser = argparse.ArgumentParser(add_help=False)
conf_parser.add_argument("--admin-user", help="Name of admin user")
conf_parser.add_argument("--admin-password", help="Password of admin user")
conf_parser.add_argument("--conf-file", help="Configuration file")
args, remaining_argv = conf_parser.parse_known_args();

configfile = defaults['conf_file']
if args.conf_file:
configfile = args.conf_file

config = ConfigParser.SafeConfigParser()
config.read(configfile)
if 'KEYSTONE' in config.sections():
if args.admin_user == None:
args.admin_user = config.get('KEYSTONE', 'admin_user')
if args.admin_password == None:
args.admin_password = config.get('KEYSTONE','admin_password')

if args.admin_user == None:
args.admin_user = defaults['admin_user']
if args.admin_password == None:
args.admin_password = defaults['admin_password']

parser = argparse.ArgumentParser(
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
# Inherit options from config_parser
parents=[conf_parser],
# print script description with -h/--help
description=__doc__,
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser.set_defaults(**defaults)
parser.add_argument("--analytics-api-ip", help="IP address of Analytics API Server")
parser.add_argument("--analytics-api-port", help="Port of Analytcis API Server")
Expand All @@ -99,12 +130,10 @@ def parse_args(self):
"--where", help="List of Where Terms to be ANDed", nargs='+')
parser.add_argument(
"--sort", help="List of Sort Terms", nargs='+')
parser.add_argument(
"--admin-user", help="Name of admin user", default="admin")
parser.add_argument(
"--admin-password", help="Password of admin user",
default="contrail123")
self._args = parser.parse_args()
self._args = parser.parse_args(remaining_argv)

self._args.admin_user = args.admin_user
self._args.admin_password = args.admin_password

if self._args.table is None and self._args.dtable is None:
return -1
Expand Down

0 comments on commit 82f8603

Please sign in to comment.