summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex O'Rourke <alex.orourke@hp.com>2015-06-19 09:51:14 -0700
committerAlex O'Rourke <alex.orourke@hp.com>2015-06-19 09:57:18 -0700
commit2b7c63487d27099c7940c4a5cd1010912d379d3a (patch)
tree2b96514522f45be13d36fca90f88c7af54795d87
parentb2e7a05ec324b4cd6f2fe41ed3484ab14ab1b83b (diff)
HP 3PAR driver config has unused username/password
Removed all references to hp3par_username and hp3par_password in the code and documentation as it is currently not used. Closes-Bug: 1463942 Change-Id: I4dd459077fdeb3387f08cfc0ea08948685e6f4cb
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Ben Swartzlander <ben@swartzlander.org> Code-Review+2: Mark Sturdevant <mark.sturdevant@hp.com> Code-Review+2: Clinton Knight <cknight@netapp.com> Workflow+1: Clinton Knight <cknight@netapp.com> Code-Review+1: Sean McGinnis <sean.mcginnis@gmail.com> Code-Review+1: zhongjun <jun.zhongjun@huawei.com> Submitted-by: Jenkins Submitted-at: Sat, 20 Jun 2015 02:08:44 +0000 Reviewed-on: https://review.openstack.org/193637 Project: openstack/manila Branch: refs/heads/master
-rw-r--r--doc/source/devref/hp_3par_driver.rst2
-rw-r--r--manila/share/drivers/hp/hp_3par_driver.py9
-rw-r--r--manila/share/drivers/hp/hp_3par_mediator.py2
-rw-r--r--manila/tests/share/drivers/hp/test_hp_3par_driver.py8
-rw-r--r--manila/tests/share/drivers/hp/test_hp_3par_mediator.py2
5 files changed, 0 insertions, 23 deletions
diff --git a/doc/source/devref/hp_3par_driver.rst b/doc/source/devref/hp_3par_driver.rst
index 61aec14..afbc9a0 100644
--- a/doc/source/devref/hp_3par_driver.rst
+++ b/doc/source/devref/hp_3par_driver.rst
@@ -88,8 +88,6 @@ file for the HP 3PAR driver:
88- `hp3par_share_ip_address` = <IP address to use for share export location> 88- `hp3par_share_ip_address` = <IP address to use for share export location>
89- `hp3par_san_ip` = <IP address for SSH access to the SAN controller> 89- `hp3par_san_ip` = <IP address for SSH access to the SAN controller>
90- `hp3par_api_url` = <3PAR WS API Server URL> 90- `hp3par_api_url` = <3PAR WS API Server URL>
91- `hp3par_username` = <3PAR superuser username>
92- `hp3par_password` = <3PAR superuser password>
93- `hp3par_san_login` = <Username for SSH access to the SAN controller> 91- `hp3par_san_login` = <Username for SSH access to the SAN controller>
94- `hp3par_san_password` = <Password for SSH access to the SAN controller> 92- `hp3par_san_password` = <Password for SSH access to the SAN controller>
95- `hp3par_debug` = <False or True for extra debug logging> 93- `hp3par_debug` = <False or True for extra debug logging>
diff --git a/manila/share/drivers/hp/hp_3par_driver.py b/manila/share/drivers/hp/hp_3par_driver.py
index bbd6985..2b7570e 100644
--- a/manila/share/drivers/hp/hp_3par_driver.py
+++ b/manila/share/drivers/hp/hp_3par_driver.py
@@ -34,13 +34,6 @@ HP3PAR_OPTS = [
34 default='', 34 default='',
35 help="3PAR WSAPI Server Url like " 35 help="3PAR WSAPI Server Url like "
36 "https://<3par ip>:8080/api/v1"), 36 "https://<3par ip>:8080/api/v1"),
37 cfg.StrOpt('hp3par_username',
38 default='',
39 help="3PAR Super user username"),
40 cfg.StrOpt('hp3par_password',
41 default='',
42 help="3PAR Super user password",
43 secret=True),
44 cfg.StrOpt('hp3par_san_ip', 37 cfg.StrOpt('hp3par_san_ip',
45 default='', 38 default='',
46 help="IP address of SAN controller"), 39 help="IP address of SAN controller"),
@@ -107,8 +100,6 @@ class HP3ParShareDriver(driver.ShareDriver):
107 "hp3par_share_ip_address is not set.")) 100 "hp3par_share_ip_address is not set."))
108 101
109 mediator = hp_3par_mediator.HP3ParMediator( 102 mediator = hp_3par_mediator.HP3ParMediator(
110 hp3par_username=self.configuration.hp3par_username,
111 hp3par_password=self.configuration.hp3par_password,
112 hp3par_api_url=self.configuration.hp3par_api_url, 103 hp3par_api_url=self.configuration.hp3par_api_url,
113 hp3par_debug=self.configuration.hp3par_debug, 104 hp3par_debug=self.configuration.hp3par_debug,
114 hp3par_san_ip=self.configuration.hp3par_san_ip, 105 hp3par_san_ip=self.configuration.hp3par_san_ip,
diff --git a/manila/share/drivers/hp/hp_3par_mediator.py b/manila/share/drivers/hp/hp_3par_mediator.py
index 4458c97..dd11eed 100644
--- a/manila/share/drivers/hp/hp_3par_mediator.py
+++ b/manila/share/drivers/hp/hp_3par_mediator.py
@@ -44,8 +44,6 @@ class HP3ParMediator(object):
44 44
45 def __init__(self, **kwargs): 45 def __init__(self, **kwargs):
46 46
47 self.hp3par_username = kwargs.get('hp3par_username')
48 self.hp3par_password = kwargs.get('hp3par_password')
49 self.hp3par_api_url = kwargs.get('hp3par_api_url') 47 self.hp3par_api_url = kwargs.get('hp3par_api_url')
50 self.hp3par_debug = kwargs.get('hp3par_debug') 48 self.hp3par_debug = kwargs.get('hp3par_debug')
51 self.hp3par_san_ip = kwargs.get('hp3par_san_ip') 49 self.hp3par_san_ip = kwargs.get('hp3par_san_ip')
diff --git a/manila/tests/share/drivers/hp/test_hp_3par_driver.py b/manila/tests/share/drivers/hp/test_hp_3par_driver.py
index ef700a4..acf5e12 100644
--- a/manila/tests/share/drivers/hp/test_hp_3par_driver.py
+++ b/manila/tests/share/drivers/hp/test_hp_3par_driver.py
@@ -34,8 +34,6 @@ class HP3ParDriverTestCase(test.TestCase):
34 self.conf = mock.Mock() 34 self.conf = mock.Mock()
35 self.conf.driver_handles_share_servers = False 35 self.conf.driver_handles_share_servers = False
36 self.conf.hp3par_debug = constants.EXPECTED_HP_DEBUG 36 self.conf.hp3par_debug = constants.EXPECTED_HP_DEBUG
37 self.conf.hp3par_username = constants.USERNAME
38 self.conf.hp3par_password = constants.PASSWORD
39 self.conf.hp3par_api_url = constants.API_URL 37 self.conf.hp3par_api_url = constants.API_URL
40 self.conf.hp3par_san_login = constants.SAN_LOGIN 38 self.conf.hp3par_san_login = constants.SAN_LOGIN
41 self.conf.hp3par_san_password = constants.SAN_PASSWORD 39 self.conf.hp3par_san_password = constants.SAN_PASSWORD
@@ -72,11 +70,9 @@ class HP3ParDriverTestCase(test.TestCase):
72 self.mock_mediator_constructor.assert_has_calls([ 70 self.mock_mediator_constructor.assert_has_calls([
73 mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port, 71 mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
74 hp3par_san_password=conf.hp3par_san_password, 72 hp3par_san_password=conf.hp3par_san_password,
75 hp3par_username=conf.hp3par_username,
76 hp3par_san_login=conf.hp3par_san_login, 73 hp3par_san_login=conf.hp3par_san_login,
77 hp3par_debug=conf.hp3par_debug, 74 hp3par_debug=conf.hp3par_debug,
78 hp3par_api_url=conf.hp3par_api_url, 75 hp3par_api_url=conf.hp3par_api_url,
79 hp3par_password=conf.hp3par_password,
80 hp3par_san_ip=conf.hp3par_san_ip, 76 hp3par_san_ip=conf.hp3par_san_ip,
81 hp3par_fstore_per_share=conf.hp3par_fstore_per_share, 77 hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
82 ssh_conn_timeout=conf.ssh_conn_timeout)]) 78 ssh_conn_timeout=conf.ssh_conn_timeout)])
@@ -100,11 +96,9 @@ class HP3ParDriverTestCase(test.TestCase):
100 self.mock_mediator_constructor.assert_has_calls([ 96 self.mock_mediator_constructor.assert_has_calls([
101 mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port, 97 mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
102 hp3par_san_password=conf.hp3par_san_password, 98 hp3par_san_password=conf.hp3par_san_password,
103 hp3par_username=conf.hp3par_username,
104 hp3par_san_login=conf.hp3par_san_login, 99 hp3par_san_login=conf.hp3par_san_login,
105 hp3par_debug=conf.hp3par_debug, 100 hp3par_debug=conf.hp3par_debug,
106 hp3par_api_url=conf.hp3par_api_url, 101 hp3par_api_url=conf.hp3par_api_url,
107 hp3par_password=conf.hp3par_password,
108 hp3par_san_ip=conf.hp3par_san_ip, 102 hp3par_san_ip=conf.hp3par_san_ip,
109 hp3par_fstore_per_share=conf.hp3par_fstore_per_share, 103 hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
110 ssh_conn_timeout=conf.ssh_conn_timeout)]) 104 ssh_conn_timeout=conf.ssh_conn_timeout)])
@@ -124,11 +118,9 @@ class HP3ParDriverTestCase(test.TestCase):
124 self.mock_mediator_constructor.assert_has_calls([ 118 self.mock_mediator_constructor.assert_has_calls([
125 mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port, 119 mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
126 hp3par_san_password=conf.hp3par_san_password, 120 hp3par_san_password=conf.hp3par_san_password,
127 hp3par_username=conf.hp3par_username,
128 hp3par_san_login=conf.hp3par_san_login, 121 hp3par_san_login=conf.hp3par_san_login,
129 hp3par_debug=conf.hp3par_debug, 122 hp3par_debug=conf.hp3par_debug,
130 hp3par_api_url=conf.hp3par_api_url, 123 hp3par_api_url=conf.hp3par_api_url,
131 hp3par_password=conf.hp3par_password,
132 hp3par_san_ip=conf.hp3par_san_ip, 124 hp3par_san_ip=conf.hp3par_san_ip,
133 hp3par_fstore_per_share=conf.hp3par_fstore_per_share, 125 hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
134 ssh_conn_timeout=conf.ssh_conn_timeout)]) 126 ssh_conn_timeout=conf.ssh_conn_timeout)])
diff --git a/manila/tests/share/drivers/hp/test_hp_3par_mediator.py b/manila/tests/share/drivers/hp/test_hp_3par_mediator.py
index 05345da..8b9d47a 100644
--- a/manila/tests/share/drivers/hp/test_hp_3par_mediator.py
+++ b/manila/tests/share/drivers/hp/test_hp_3par_mediator.py
@@ -53,8 +53,6 @@ class HP3ParMediatorTestCase(test.TestCase):
53 53
54 # Set the mediator to use in tests. 54 # Set the mediator to use in tests.
55 self.mediator = hp3parmediator.HP3ParMediator( 55 self.mediator = hp3parmediator.HP3ParMediator(
56 hp3par_username=constants.USERNAME,
57 hp3par_password=constants.PASSWORD,
58 hp3par_api_url=constants.API_URL, 56 hp3par_api_url=constants.API_URL,
59 hp3par_debug=constants.EXPECTED_HP_DEBUG, 57 hp3par_debug=constants.EXPECTED_HP_DEBUG,
60 hp3par_san_ip=constants.EXPECTED_IP_1234, 58 hp3par_san_ip=constants.EXPECTED_IP_1234,