Browse Source

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
tags/1.0.0.0b1
Alex O'Rourke 3 years ago
parent
commit
2b7c63487d

+ 0
- 2
doc/source/devref/hp_3par_driver.rst View File

@@ -88,8 +88,6 @@ file for the HP 3PAR driver:
88 88
 - `hp3par_share_ip_address` = <IP address to use for share export location>
89 89
 - `hp3par_san_ip` = <IP address for SSH access to the SAN controller>
90 90
 - `hp3par_api_url` = <3PAR WS API Server URL>
91
-- `hp3par_username` = <3PAR superuser username>
92
-- `hp3par_password` = <3PAR superuser password>
93 91
 - `hp3par_san_login` = <Username for SSH access to the SAN controller>
94 92
 - `hp3par_san_password` = <Password for SSH access to the SAN controller>
95 93
 - `hp3par_debug` = <False or True for extra debug logging>

+ 0
- 9
manila/share/drivers/hp/hp_3par_driver.py View File

@@ -34,13 +34,6 @@ HP3PAR_OPTS = [
34 34
                default='',
35 35
                help="3PAR WSAPI Server Url like "
36 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 37
     cfg.StrOpt('hp3par_san_ip',
45 38
                default='',
46 39
                help="IP address of SAN controller"),
@@ -107,8 +100,6 @@ class HP3ParShareDriver(driver.ShareDriver):
107 100
                   "hp3par_share_ip_address is not set."))
108 101
 
109 102
         mediator = hp_3par_mediator.HP3ParMediator(
110
-            hp3par_username=self.configuration.hp3par_username,
111
-            hp3par_password=self.configuration.hp3par_password,
112 103
             hp3par_api_url=self.configuration.hp3par_api_url,
113 104
             hp3par_debug=self.configuration.hp3par_debug,
114 105
             hp3par_san_ip=self.configuration.hp3par_san_ip,

+ 0
- 2
manila/share/drivers/hp/hp_3par_mediator.py View File

@@ -44,8 +44,6 @@ class HP3ParMediator(object):
44 44
 
45 45
     def __init__(self, **kwargs):
46 46
 
47
-        self.hp3par_username = kwargs.get('hp3par_username')
48
-        self.hp3par_password = kwargs.get('hp3par_password')
49 47
         self.hp3par_api_url = kwargs.get('hp3par_api_url')
50 48
         self.hp3par_debug = kwargs.get('hp3par_debug')
51 49
         self.hp3par_san_ip = kwargs.get('hp3par_san_ip')

+ 0
- 8
manila/tests/share/drivers/hp/test_hp_3par_driver.py View File

@@ -34,8 +34,6 @@ class HP3ParDriverTestCase(test.TestCase):
34 34
         self.conf = mock.Mock()
35 35
         self.conf.driver_handles_share_servers = False
36 36
         self.conf.hp3par_debug = constants.EXPECTED_HP_DEBUG
37
-        self.conf.hp3par_username = constants.USERNAME
38
-        self.conf.hp3par_password = constants.PASSWORD
39 37
         self.conf.hp3par_api_url = constants.API_URL
40 38
         self.conf.hp3par_san_login = constants.SAN_LOGIN
41 39
         self.conf.hp3par_san_password = constants.SAN_PASSWORD
@@ -72,11 +70,9 @@ class HP3ParDriverTestCase(test.TestCase):
72 70
         self.mock_mediator_constructor.assert_has_calls([
73 71
             mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
74 72
                       hp3par_san_password=conf.hp3par_san_password,
75
-                      hp3par_username=conf.hp3par_username,
76 73
                       hp3par_san_login=conf.hp3par_san_login,
77 74
                       hp3par_debug=conf.hp3par_debug,
78 75
                       hp3par_api_url=conf.hp3par_api_url,
79
-                      hp3par_password=conf.hp3par_password,
80 76
                       hp3par_san_ip=conf.hp3par_san_ip,
81 77
                       hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
82 78
                       ssh_conn_timeout=conf.ssh_conn_timeout)])
@@ -100,11 +96,9 @@ class HP3ParDriverTestCase(test.TestCase):
100 96
         self.mock_mediator_constructor.assert_has_calls([
101 97
             mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
102 98
                       hp3par_san_password=conf.hp3par_san_password,
103
-                      hp3par_username=conf.hp3par_username,
104 99
                       hp3par_san_login=conf.hp3par_san_login,
105 100
                       hp3par_debug=conf.hp3par_debug,
106 101
                       hp3par_api_url=conf.hp3par_api_url,
107
-                      hp3par_password=conf.hp3par_password,
108 102
                       hp3par_san_ip=conf.hp3par_san_ip,
109 103
                       hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
110 104
                       ssh_conn_timeout=conf.ssh_conn_timeout)])
@@ -124,11 +118,9 @@ class HP3ParDriverTestCase(test.TestCase):
124 118
         self.mock_mediator_constructor.assert_has_calls([
125 119
             mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
126 120
                       hp3par_san_password=conf.hp3par_san_password,
127
-                      hp3par_username=conf.hp3par_username,
128 121
                       hp3par_san_login=conf.hp3par_san_login,
129 122
                       hp3par_debug=conf.hp3par_debug,
130 123
                       hp3par_api_url=conf.hp3par_api_url,
131
-                      hp3par_password=conf.hp3par_password,
132 124
                       hp3par_san_ip=conf.hp3par_san_ip,
133 125
                       hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
134 126
                       ssh_conn_timeout=conf.ssh_conn_timeout)])

+ 0
- 2
manila/tests/share/drivers/hp/test_hp_3par_mediator.py View File

@@ -53,8 +53,6 @@ class HP3ParMediatorTestCase(test.TestCase):
53 53
 
54 54
         # Set the mediator to use in tests.
55 55
         self.mediator = hp3parmediator.HP3ParMediator(
56
-            hp3par_username=constants.USERNAME,
57
-            hp3par_password=constants.PASSWORD,
58 56
             hp3par_api_url=constants.API_URL,
59 57
             hp3par_debug=constants.EXPECTED_HP_DEBUG,
60 58
             hp3par_san_ip=constants.EXPECTED_IP_1234,

Loading…
Cancel
Save