summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maier <maiera@de.ibm.com>2017-01-25 15:36:36 +0100
committerAndreas Scheuring <andreas.scheuring@de.ibm.com>2017-01-26 16:47:24 +0100
commit94d8e2293fbcdee924430ea85a050a31d742f6bf (patch)
treeba43f36c3444f3c28ff588930c52735007ce2f3a
parent5b243174b2817f56e459ab72693eca10cfd09925 (diff)
Changed name of cpc_uuid config option to cpc_object_id1.0.00.2.0stable/ocata
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 <maiera@de.ibm.com>
Notes
Notes (review): Code-Review+2: Andreas Scheuring <andreas.scheuring@de.ibm.com> Workflow+1: Andreas Scheuring <andreas.scheuring@de.ibm.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 26 Jan 2017 16:26:24 +0000 Reviewed-on: https://review.openstack.org/425210 Project: openstack/os-dpm Branch: refs/heads/master
-rw-r--r--os_dpm/config/config.py2
-rw-r--r--os_dpm/tests/unit/config/test_config.py4
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 = [
33 User name for connection to the HMC"""), 33 User name for connection to the HMC"""),
34 cfg.StrOpt('hmc_password', help=""" 34 cfg.StrOpt('hmc_password', help="""
35 Password for connection to the HMC"""), 35 Password for connection to the HMC"""),
36 cfg.StrOpt('cpc_uuid', help=""" 36 cfg.StrOpt('cpc_object_id', help="""
37 DPM Object-id of the target CPC"""), 37 DPM Object-id of the target CPC"""),
38] 38]
39 39
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):
27 conf.load_raw_values(group="dpm", hmc='host') 27 conf.load_raw_values(group="dpm", hmc='host')
28 conf.load_raw_values(group="dpm", hmc_username='username') 28 conf.load_raw_values(group="dpm", hmc_username='username')
29 conf.load_raw_values(group="dpm", hmc_password='password') 29 conf.load_raw_values(group="dpm", hmc_password='password')
30 conf.load_raw_values(group="dpm", cpc_uuid='uuid') 30 conf.load_raw_values(group="dpm", cpc_object_id='uuid')
31 31
32 config.register_opts() 32 config.register_opts()
33 self.assertEqual('host', cfg.CONF.dpm.hmc) 33 self.assertEqual('host', cfg.CONF.dpm.hmc)
34 self.assertEqual('username', cfg.CONF.dpm.hmc_username) 34 self.assertEqual('username', cfg.CONF.dpm.hmc_username)
35 self.assertEqual('password', cfg.CONF.dpm.hmc_password) 35 self.assertEqual('password', cfg.CONF.dpm.hmc_password)
36 self.assertEqual('uuid', cfg.CONF.dpm.cpc_uuid) 36 self.assertEqual('uuid', cfg.CONF.dpm.cpc_object_id)