From f1f8f5e98e6e9c216a4af7f43783e6cc37eaaea4 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Thu, 19 Nov 2015 16:30:37 -0500
Subject: [PATCH] Add check_uptodate.sh --checkopts to "pep8"

2f9e416 Downstream Fix for Genconfig
  collided with
fb17ed8 Add -constraints for CI jobs

while merging and this only got added to
pep8-constraints.  It should be in "pep8" as well.

opts.py is updated here since it is out of sync,
due to this test not running.

Change-Id: I668df6be4301a052a4b47549c702a81b43abd8fc
---
 cinder/opts.py | 15 +++++++--------
 tox.ini        |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cinder/opts.py b/cinder/opts.py
index dd4cf5ebd..8d65f8031 100644
--- a/cinder/opts.py
+++ b/cinder/opts.py
@@ -96,6 +96,8 @@ from cinder.volume.drivers.hitachi import hnas_nfs as \
     cinder_volume_drivers_hitachi_hnasnfs
 from cinder.volume.drivers.hpe import hpe_3par_common as \
     cinder_volume_drivers_hpe_hpe3parcommon
+from cinder.volume.drivers.hpe import hpe_lefthand_iscsi as \
+    cinder_volume_drivers_hpe_hpelefthandiscsi
 from cinder.volume.drivers.huawei import huawei_driver as \
     cinder_volume_drivers_huawei_huaweidriver
 from cinder.volume.drivers.ibm import flashsystem_common as \
@@ -125,8 +127,6 @@ from cinder.volume.drivers import pure as cinder_volume_drivers_pure
 from cinder.volume.drivers import quobyte as cinder_volume_drivers_quobyte
 from cinder.volume.drivers import rbd as cinder_volume_drivers_rbd
 from cinder.volume.drivers import remotefs as cinder_volume_drivers_remotefs
-from cinder.volume.drivers.san.hp import hp_lefthand_rest_proxy as \
-    cinder_volume_drivers_san_hp_hplefthandrestproxy
 from cinder.volume.drivers.san.hp import hp_xp_opts as \
     cinder_volume_drivers_san_hp_hpxpopts
 from cinder.volume.drivers.san.hp import hpmsa_common as \
@@ -177,7 +177,8 @@ def list_opts():
                 cinder_backup_chunkeddriver.chunkedbackup_service_opts,
                 cinder_volume_drivers_san_san.san_opts,
                 cinder_volume_drivers_hitachi_hnasnfs.NFS_OPTS,
-                cinder_volume_drivers_violin_v7000common.violin_opts,
+                cinder_wsgi_eventletserver.socket_opts,
+                cinder_wsgi_eventletserver.eventlet_opts,
                 cinder_sshutils.ssh_opts,
                 cinder_volume_drivers_netapp_options.netapp_proxy_opts,
                 cinder_volume_drivers_netapp_options.netapp_connection_opts,
@@ -197,7 +198,7 @@ def list_opts():
                 cinder_volume_drivers_san_hp_hpxpopts.HORCM_VOLUME_OPTS,
                 cinder_test.test_opts,
                 cinder.volume.drivers.ibm.storwize_svc.storwize_svc_opts,
-                cinder_backup_manager.backup_manager_opts,
+                cinder_volume_drivers_violin_v7000common.violin_opts,
                 cinder_exception.exc_log_opts,
                 cinder_common_config.global_opts,
                 cinder_scheduler_weights_capacity.capacity_weight_opts,
@@ -239,8 +240,6 @@ def list_opts():
                 volume_number_weight_opts,
                 cinder_volume_drivers_xio.XIO_OPTS,
                 cinder_volume_drivers_zfssa_zfssaiscsi.ZFSSA_OPTS,
-                cinder_wsgi_eventletserver.socket_opts,
-                cinder_wsgi_eventletserver.eventlet_opts,
                 cinder_volume_driver.volume_opts,
                 cinder_volume_driver.iser_opts,
                 cinder_api_views_versions.versions_opts,
@@ -250,6 +249,7 @@ def list_opts():
                 cinder_volume_drivers_san_hp_hpmsacommon.iscsi_opts,
                 cinder_image_glance.glance_opts,
                 cinder_image_glance.glance_core_properties_opts,
+                cinder_volume_drivers_hpe_hpelefthandiscsi.hpelefthand_opts,
                 cinder_volume_drivers_lvm.volume_opts,
                 cinder_volume_drivers_emc_emcvmaxcommon.emc_opts,
                 cinder_volume_drivers_remotefs.nas_opts,
@@ -267,8 +267,7 @@ def list_opts():
                 cinder_volume_drivers_rbd.rbd_opts,
                 cinder_volume_drivers_tintri.tintri_opts,
                 cinder_volume_drivers_hitachi_hbsdhorcm.volume_opts,
-                cinder_volume_drivers_san_hp_hplefthandrestproxy.
-                hplefthand_opts,
+                cinder_backup_manager.backup_manager_opts,
                 cinder_volume_drivers_hitachi_hbsdfc.volume_opts,
                 cinder_quota.quota_opts,
                 cinder_volume_drivers_huawei_huaweidriver.huawei_opts,
diff --git a/tox.ini b/tox.ini
index 074ace4c5..b657bb034 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,6 +49,7 @@ commands =
   flake8 {posargs} . cinder/common
   # Check that .po and .pot files are valid:
   bash -c "find cinder -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
+  {toxinidir}/tools/config/check_uptodate.sh --checkopts
   {toxinidir}/tools/config/check_uptodate.sh
   {toxinidir}/tools/check_exec.py {toxinidir}/cinder
 
-- 
2.45.2