From 94d8e2293fbcdee924430ea85a050a31d742f6bf Mon Sep 17 00:00:00 2001 From: Andreas Maier Date: Wed, 25 Jan 2017 15:36:36 +0100 Subject: [PATCH] Changed name of cpc_uuid config option to cpc_object_id Reason for the change is that the HMC API book does not mention anywhere that the format of the ID is a UUID, and the name of the resource property is "object-id". This change set changes the name of the DPM config option "cpc_uuid" to "cpc_object_id", and updates the unit testcase accordingly. Change-Id: I9f4b7dbbdbb19d00c6f0752c028a7462c2bbee3e Partial-Bug: 1659304 Signed-off-by: Andreas Maier --- os_dpm/config/config.py | 2 +- os_dpm/tests/unit/config/test_config.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/os_dpm/config/config.py b/os_dpm/config/config.py index 32d07cc..a9632d1 100644 --- a/os_dpm/config/config.py +++ b/os_dpm/config/config.py @@ -33,7 +33,7 @@ COMMON_DPM_OPTS = [ User name for connection to the HMC"""), cfg.StrOpt('hmc_password', help=""" Password for connection to the HMC"""), - cfg.StrOpt('cpc_uuid', help=""" + cfg.StrOpt('cpc_object_id', help=""" DPM Object-id of the target CPC"""), ] diff --git a/os_dpm/tests/unit/config/test_config.py b/os_dpm/tests/unit/config/test_config.py index bed6759..36fbc14 100644 --- a/os_dpm/tests/unit/config/test_config.py +++ b/os_dpm/tests/unit/config/test_config.py @@ -27,10 +27,10 @@ class TestNetworkingDpm(base.BaseTestCase): conf.load_raw_values(group="dpm", hmc='host') conf.load_raw_values(group="dpm", hmc_username='username') conf.load_raw_values(group="dpm", hmc_password='password') - conf.load_raw_values(group="dpm", cpc_uuid='uuid') + conf.load_raw_values(group="dpm", cpc_object_id='uuid') config.register_opts() self.assertEqual('host', cfg.CONF.dpm.hmc) self.assertEqual('username', cfg.CONF.dpm.hmc_username) self.assertEqual('password', cfg.CONF.dpm.hmc_password) - self.assertEqual('uuid', cfg.CONF.dpm.cpc_uuid) + self.assertEqual('uuid', cfg.CONF.dpm.cpc_object_id)