diff options
| author | Nisha Agarwal <agarwalnisha1980@gmail.com> | 2017-02-10 08:16:49 -0800 |
|---|---|---|
| committer | Nisha Agarwal <agarwalnisha1980@gmail.com> | 2017-02-10 09:44:19 -0800 |
| commit | 442849b7a7ed6dfc3d06a14a0516e79fc78db8d9 (patch) | |
| tree | d2aee4407687fd21e807e9b3c2f0a91ee2c1cc3b /ironic/tests/unit/drivers | |
| parent | 2b10dd8bfce789b50f29cff0d3f372dfdb56e19d (diff) | |
| download | ironic-442849b7a7ed6dfc3d06a14a0516e79fc78db8d9.tar.gz | |
Follow up patch for SNMPv3 support
Fixes the minor issues with SNMPv3 inspection
Closes-Bug: 1609622
Change-Id: Ic5c397e57060f4d6d01fa9f16f371408af7aae3e
Diffstat (limited to 'ironic/tests/unit/drivers')
| -rw-r--r-- | ironic/tests/unit/drivers/modules/ilo/test_common.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_common.py b/ironic/tests/unit/drivers/modules/ilo/test_common.py index c2685d308..1b412c78d 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_common.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_common.py @@ -93,8 +93,7 @@ class IloValidateParametersTestCase(db_base.DbTestCase): d_info = {'ca_file': '/home/user/cafile.pem', 'snmp_auth_prot_password': '1234', 'snmp_auth_user': 'user', - 'snmp_auth_priv_password': '4321', - 'auth_priv_pp': '4321'} + 'snmp_auth_priv_password': '4321'} self.node.driver_info.update(d_info) info = ilo_common.parse_driver_info(self.node) self.assertEqual(INFO_DICT['ilo_address'], info['ilo_address']) @@ -223,8 +222,7 @@ class IloCommonMethodsTestCase(db_base.DbTestCase): @mock.patch.object(os.path, 'isfile', return_value=True, autospec=True) @mock.patch.object(ilo_client, 'IloClient', spec_set=True, autospec=True) - def _test_get_ilo_object(self, ilo_client_mock, isFile_mock, ca_file=None, - snmp_credentials=None): + def _test_get_ilo_object(self, ilo_client_mock, isFile_mock, ca_file=None): self.info['client_timeout'] = 600 self.info['client_port'] = 4433 self.info['ca_file'] = ca_file @@ -238,7 +236,7 @@ class IloCommonMethodsTestCase(db_base.DbTestCase): self.info['client_timeout'], self.info['client_port'], cacert=self.info['ca_file'], - snmp_credentials=snmp_credentials) + snmp_credentials=None) self.assertEqual('ilo_object', returned_ilo_object) @mock.patch.object(os.path, 'isfile', return_value=True, autospec=True) @@ -247,9 +245,10 @@ class IloCommonMethodsTestCase(db_base.DbTestCase): def test_get_ilo_object_snmp(self, ilo_client_mock, isFile_mock): info = {'auth_user': 'user', 'auth_prot_pp': '1234', - 'priv_prot_pp': '4321', + 'auth_priv_pp': '4321', 'auth_protocol': 'SHA', - 'priv_protocol': 'AES'} + 'priv_protocol': 'AES', + 'snmp_inspection': True} d_info = {'client_timeout': 600, 'client_port': 4433, 'ca_file': 'ca_file', @@ -262,11 +261,6 @@ class IloCommonMethodsTestCase(db_base.DbTestCase): self.node.driver_info = self.info ilo_client_mock.return_value = 'ilo_object' returned_ilo_object = ilo_common.get_ilo_object(self.node) - info = {'auth_user': 'user', - 'auth_prot_pp': '1234', - 'priv_prot_pp': '4321', - 'auth_protocol': 'SHA', - 'priv_protocol': 'AES'} ilo_client_mock.assert_called_with( self.info['ilo_address'], self.info['ilo_username'], |