Use os-dpm

Os-dpm [1] is a shared library between nova-dpm and networking-dpm.
For now it contains the common config options between those 2
projects.

This patch switches over to use os-dpm. Config options that where
duplicates between nova-dpm and os-dpm, are now removed from
nova-dpm. This affects

* hmc
* hmc_password
* hmc_username
* cpc_object_id

Change-Id: If0b877101a9603ce04a5e0aaba3d4b9359b8d0fd
Closes-Bug: #1661315

nova_dpm/conf/dpm.py

@@ -12,20 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from os_dpm.config import config as os_dpm_conf
 from oslo_config import cfg
 
 
-dpm_group = cfg.OptGroup('dpm',
-                         title='DPM options',
-                         help="""
-The IBM z13 system generation (and IBM LinuxONE) introduced a new
-administrative mode named "Dynamic Partition Manager" (DPM) that allows for
-managing the firmware-based logical partition hypervisor (PR/SM) with the
-dynamic capabilities known from software-based hypervisors. A z13 or LinuxONE
-machine is termed CPC (Central Processor Complex). Its management access point
-is the z Systems HMC (Hardware Management Console) which exposes a Web Services
-API that is used by the Nova driver for DPM and by the Neutron agent for DPM.
-One HMC can manage multiple CPCs.
+os_dpm_conf.DPM_GROUP.help += """
 
 DPM config options for the Nova compute service (one for each OpenStack
 hypervisor host) specify the target CPC, the HMC managing it, and limits on the
@@ -33,20 +24,11 @@ resource usage on the target CPC. These limits ensure that only a subset of the
 target CPC is used for the OpenStack hypervisor host. To use the Nova driver
 for DPM, the `[DEFAULT].compute_driver` config option needs to be set to the
 value `dpm.DPMDriver`.
-""")
-
+"""
 
 ALL_DPM_OPTS = [
-    cfg.StrOpt('hmc', default='', required=True, help="""
-    Hostname or IP address of the HMC that manages the target CPC"""),
-    cfg.StrOpt('hmc_username', default='', required=True, help="""
-    User name for connection to the HMC"""),
-    cfg.StrOpt('hmc_password', default='', required=True, help="""
-    Password for connection to the HMC"""),
     cfg.StrOpt('host', default='', required=True, help="""
     Name of the OpenStack hypervisor host"""),
-    cfg.StrOpt('cpc_object_id', help="""
-    Object-id of the target CPC"""),
     cfg.IntOpt('max_processors', help="""
     Maximum number of shared physical IFL processors on the target CPC that can
     be used for this OpenStack hypervisor host"""),
@@ -62,9 +44,10 @@ ALL_DPM_OPTS = [
 
 
 def register_opts(conf):
-    conf.register_group(dpm_group)
-    conf.register_opts(ALL_DPM_OPTS, group=dpm_group)
+    os_dpm_conf.register_opts()
+    conf.register_opts(ALL_DPM_OPTS, group=os_dpm_conf.DPM_GROUP)
 
 
 def list_opts():
-    return [(dpm_group, ALL_DPM_OPTS)]
+    return [(os_dpm_conf.DPM_GROUP,
+             ALL_DPM_OPTS + os_dpm_conf.COMMON_DPM_OPTS)]

requirements.txt

@@ -3,4 +3,5 @@
 # process, which may cause wedges in the gate later.
 
 pbr>=1.8 # Apache-2.0
+os-dpm>=1.0.0 # Apache-2.0
 zhmcclient>=0.9.0 # Apache 2.0 License

test-requirements.txt

@@ -8,6 +8,8 @@ coverage>=4.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
 sphinxcontrib-seqdiag # BSD
+# Required for RTD build
+os-dpm>=1.0.0 # Apache-2.0
 oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0