diff options
| author | George Kraft <george.kraft@calxeda.com> | 2013-12-17 13:34:52 -0600 |
|---|---|---|
| committer | George Kraft <george.kraft@calxeda.com> | 2013-12-17 13:34:52 -0600 |
| commit | a33148ed61ef8d4865674206404a9f9798526bc5 (patch) | |
| tree | 69a0a5a56ae57e6547b6b853682d9f19f8dc4315 | |
| parent | 563791b0b4dd98ddb990f3e51fac4ebce2cdb9b5 (diff) | |
| download | cxmanage-a33148ed61ef8d4865674206404a9f9798526bc5.tar.gz | |
CXMAN-223: Make Node._run_fabric_command public
Fabric already calls it, and I'll be using it in CLI as well.
Renamed it to run_fabric_tftp_command to be more descriptive, and
also updated the docstring.
| -rw-r--r-- | cxmanage_api/fabric.py | 4 | ||||
| -rw-r--r-- | cxmanage_api/node.py | 26 |
2 files changed, 19 insertions, 11 deletions
diff --git a/cxmanage_api/fabric.py b/cxmanage_api/fabric.py index 11c8a7d..4184dd1 100644 --- a/cxmanage_api/fabric.py +++ b/cxmanage_api/fabric.py @@ -334,7 +334,7 @@ class Fabric(object): """ results = {} - filename = self.primary_node._run_fabric_command( + filename = self.primary_node.run_fabric_tftp_command( 'fabric_config_get_networks' ) regex = re.compile(r'\d+ Network (\w+), private=(\d)') @@ -451,7 +451,7 @@ class Fabric(object): """ results = {} - filename = self.primary_node._run_fabric_command( + filename = self.primary_node.run_fabric_tftp_command( 'fabric_config_get_uplinks' ) current_uplink = None diff --git a/cxmanage_api/node.py b/cxmanage_api/node.py index 0c624ad..f276594 100644 --- a/cxmanage_api/node.py +++ b/cxmanage_api/node.py @@ -1193,7 +1193,7 @@ communication. :raises ParseError: If we fail to parse IP info """ - filename = self._run_fabric_command( + filename = self.run_fabric_tftp_command( function_name='fabric_config_get_ip_info' ) contents = open(filename).read() @@ -1258,7 +1258,7 @@ communication. :raises ParseError: If we fail to parse macaddrs output """ - filename = self._run_fabric_command( + filename = self.run_fabric_tftp_command( function_name='fabric_config_get_mac_addresses' ) contents = open(filename).read() @@ -1310,7 +1310,7 @@ communication. :raises TftpException: If the TFTP transfer fails. """ - filename = self._run_fabric_command( + filename = self.run_fabric_tftp_command( function_name='fabric_config_get_uplink_info' ) @@ -1360,7 +1360,7 @@ communication. :raises IpmiError: If the IPMI command fails. """ - filename = self._run_fabric_command( + filename = self.run_fabric_tftp_command( function_name='fabric_get_linkstats', link=link ) @@ -1394,7 +1394,7 @@ communication. :raises TftpException: If the TFTP transfer fails. """ - filename = self._run_fabric_command( + filename = self.run_fabric_tftp_command( function_name='fabric_info_get_link_map', ) @@ -1421,7 +1421,7 @@ communication. :raises TftpException: If the TFTP transfer fails. """ - filename = self._run_fabric_command( + filename = self.run_fabric_tftp_command( function_name='fabric_info_get_routing_table', ) @@ -1454,7 +1454,7 @@ communication. :raises TftpException: If the TFTP transfer fails. """ - filename = self._run_fabric_command( + filename = self.run_fabric_tftp_command( function_name='fabric_info_get_depth_chart', ) @@ -1626,8 +1626,16 @@ obtained. hexfile.seek(offset) return(hexfile.read(bytes_to_read)) - def _run_fabric_command(self, function_name, **kwargs): - """Handles the basics of sending a node a command for fabric data.""" + def run_fabric_tftp_command(self, function_name, **kwargs): + """Run a fabric TFTP command, returning the filename. + + :param function_name: BMC fabric function name + :type function_name: string + + :return: Downloaded filename + :rtype: string + + """ filename = temp_file() basename = os.path.basename(filename) try: |