api, ceph: modify ceph api code to fit for the new cephclient.
Closes-Bug: 1827658 Change-Id: Icb7e1e87b45c7f6c278a35ea962e9b214e7e87dd Signed-off-by: chenyan <yan.chen@intel.com>
This commit is contained in:
parent
319e9ab37b
commit
17336123bd
|
@ -32,3 +32,4 @@
|
||||||
- starlingx/update
|
- starlingx/update
|
||||||
- starlingx/nfv
|
- starlingx/nfv
|
||||||
- starlingx/ha
|
- starlingx/ha
|
||||||
|
- starlingx/integ
|
||||||
|
|
|
@ -109,7 +109,7 @@ def storage_get():
|
||||||
|
|
||||||
# # I/O info
|
# # I/O info
|
||||||
response, body = cephwrapper().osd_pool_stats(body='json',
|
response, body = cephwrapper().osd_pool_stats(body='json',
|
||||||
name='cinder-volumes')
|
pool_name='cinder-volumes')
|
||||||
if not response.ok:
|
if not response.ok:
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
stats = body['output'][0]['client_io_rate']
|
stats = body['output'][0]['client_io_rate']
|
||||||
|
@ -171,7 +171,7 @@ def osd_list():
|
||||||
osd['status'] = node['status']
|
osd['status'] = node['status']
|
||||||
|
|
||||||
# check if osd belongs to host
|
# check if osd belongs to host
|
||||||
response, body = cephwrapper().osd_find(body='json', id=osd['id'])
|
response, body = cephwrapper().osd_find(body='json', _id=osd['id'])
|
||||||
if response.ok and 'host' in body['output']['crush_location']:
|
if response.ok and 'host' in body['output']['crush_location']:
|
||||||
osd['host'] = body['output']['crush_location']['host']
|
osd['host'] = body['output']['crush_location']['host']
|
||||||
# else dont set hostname
|
# else dont set hostname
|
||||||
|
|
|
@ -19,7 +19,6 @@ nosehtmloutput>=0.0.3 # Apache-2.0
|
||||||
nosexcover # BSD
|
nosexcover # BSD
|
||||||
openstack.nose-plugin>=0.7 # Apache-2.0
|
openstack.nose-plugin>=0.7 # Apache-2.0
|
||||||
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
|
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
|
||||||
python-cephclient
|
|
||||||
requests>=2.10.0 # Apache-2.0
|
requests>=2.10.0 # Apache-2.0
|
||||||
selenium>=2.50.1 # Apache-2.0
|
selenium>=2.50.1 # Apache-2.0
|
||||||
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
|
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
|
||||||
|
|
1
tox.ini
1
tox.ini
|
@ -57,6 +57,7 @@ deps = {[testenv]deps}
|
||||||
-e{[tox]stxdir}/update/cgcs-patch/cgcs-patch
|
-e{[tox]stxdir}/update/cgcs-patch/cgcs-patch
|
||||||
-e{[tox]stxdir}/nfv/nfv/nfv-client
|
-e{[tox]stxdir}/nfv/nfv/nfv-client
|
||||||
-e{[tox]stxdir}/ha/service-mgmt-client/sm-client
|
-e{[tox]stxdir}/ha/service-mgmt-client/sm-client
|
||||||
|
-e{[tox]stxdir}/integ/ceph/python-cephclient/python-cephclient
|
||||||
requests-toolbelt
|
requests-toolbelt
|
||||||
pylint
|
pylint
|
||||||
commands =
|
commands =
|
||||||
|
|
Loading…
Reference in New Issue