diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-03-03 06:58:42 +0000 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-03-04 23:00:32 +0000 |
| commit | 8f72e695538c2281f923bdbf7a6d7b1d1763c70c (patch) | |
| tree | 6e5f9791ab340f0008cda575c605c47e64f97958 /tests/monitor.py | |
| parent | f093b7f19e8cd6f76b26117b18b3c9e552ad5bcc (diff) | |
urgent bug fixes for danube (1)
- create "doctor_net" and use it in VM creation in order to avoid
virtual network issues
- make sample inspector use keystone v3
- use "openstack compute service set" for unset force_down
- drop nova_force_down.py as keystone returns nova v2.1
- use '--os-project-name' except for ceilometer cli
- avoid ping check (wait_ping) with empty "COMPUTE_IP"
- add missing '$' in quota update args
- move ping check (wait_ping) into unset_forced_down_hosts() and
perform ping check only to downed compute hosts
- use wait_until() instead of wait_ping()
- put out unset_forced_down_hosts from collect_logs()
JIRA: DOCTOR-95
Co-Authored-By: Carlos Goncalves <carlos.goncalves@neclab.eu>
Change-Id: I3275ff5dd993b82029dac6a58087096baa251022
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'tests/monitor.py')
| -rw-r--r-- | tests/monitor.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/monitor.py b/tests/monitor.py index 75d82392..8d29dceb 100644 --- a/tests/monitor.py +++ b/tests/monitor.py @@ -40,11 +40,12 @@ class DoctorMonitorSample(object): raise Exception("Inspector type '%s' not supported", args.inspector_type) self.hostname = args.hostname - self.inspector_url = args.inspector_url self.inspector_type = args.inspector_type self.ip_addr = args.ip or socket.gethostbyname(self.hostname) - if self.inspector_type == 'congress': + if self.inspector_type == 'sample': + self.inspector_url = 'http://127.0.0.1:12345/events' + elif self.inspector_type == 'congress': auth = v2.Password(auth_url=os.environ['OS_AUTH_URL'], username=os.environ['OS_USERNAME'], password=os.environ['OS_PASSWORD'], @@ -114,9 +115,6 @@ def get_args(): parser.add_argument('inspector_type', metavar='INSPECTOR_TYPE', type=str, nargs='?', help='inspector to report', default='sample') - parser.add_argument('inspector_url', metavar='INSPECTOR_URL', type=str, nargs='?', - help='inspector url to report error', - default='http://127.0.0.1:12345/events') return parser.parse_args() |