mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 11:22:27 +00:00 
			
		
		
		
	catch all type error for rspconfig options (#5048)
This commit is contained in:
		| @@ -145,7 +145,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand): | ||||
|  | ||||
|             for key in keys: | ||||
|                 self._dump_download(obmc, node, str(key)) | ||||
|         except SelfServerException as e: | ||||
|         except (SelfServerException, SelfClientException) as e: | ||||
|             self.callback.error(e.message, node) | ||||
|  | ||||
|     def dump_process(self, **kw): | ||||
| @@ -174,7 +174,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand): | ||||
|             else: | ||||
|                 self.callback.error('Could not find dump %s after waiting %d seconds.' % (dump_id, 20 * 15), node) | ||||
|  | ||||
|         except SelfServerException as e: | ||||
|         except (SelfServerException, SelfClientException) as e: | ||||
|             self.callback.error(e.message, node) | ||||
|  | ||||
|     def gard_clear(self, **kw): | ||||
| @@ -188,7 +188,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand): | ||||
|             obmc.clear_gard() | ||||
|             self.callback.info('%s: GARD cleared' % node) | ||||
|  | ||||
|         except SelfServerException as e: | ||||
|         except (SelfServerException, SelfClientException) as e: | ||||
|             self.callback.error(e.message, node) | ||||
|  | ||||
|     def pre_set_sshcfg(self, *arg, **kw): | ||||
|   | ||||
| @@ -198,8 +198,8 @@ RSPCONFIG_APIS = { | ||||
|         'get_data': [], | ||||
|         'display_name': "BMC PowerSupplyRedundancy", | ||||
|         'attr_values': { | ||||
|             'disabled': "Disables", | ||||
|             'enabled': "Enabled", | ||||
|             'disabled': ["Disables"], | ||||
|             'enabled': ["Enabled"], | ||||
|         }, | ||||
|     }, | ||||
|     'powerrestorepolicy': { | ||||
| @@ -751,7 +751,11 @@ class OpenBMCRest(object): | ||||
|             data = attr_info['attr_values'][value] | ||||
|         else: | ||||
|             data = value | ||||
|         self.request('PUT', set_url, payload={"data": data}, cmd="set_%s" % key) | ||||
|  | ||||
|         method = 'PUT' | ||||
|         if key == 'powersupplyredundancy': | ||||
|             method = 'POST' | ||||
|         self.request(method, set_url, payload={"data": data}, cmd="set_%s" % key) | ||||
|  | ||||
|     def get_apis_values(self, key): | ||||
|         attr_info = RSPCONFIG_APIS[key] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user