Skip to content

Commit

Permalink
changed variable name as per review
Browse files Browse the repository at this point in the history
Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>
  • Loading branch information
samaity committed Jun 3, 2020
1 parent 20c212c commit 2f17452
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/sonic-config-engine/tests/test_cfggen_platformJson.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import ast

# Global Variable
PLATFORM_CAP = "platform_output.json"
PLATFORM_OUTPUT_FILE = "platform_output.json"

class TestCfgGenPlatformJson(TestCase):

Expand Down Expand Up @@ -66,7 +66,7 @@ def test_platform_json_all_ethernet_interfaces(self):
argument = '-m "' + self.sample_graph_simple + '" -p "' + self.platform_json + '" -S "' + self.hwsku_json + '" -v "PORT"'
output = self.run_script(argument)

sample_file = os.path.join(self.test_dir, 'sample_output', "platform_output.json")
sample_file = os.path.join(self.test_dir, 'sample_output', PLATFORM_OUTPUT_FILE)
fh = open(sample_file, 'rb')
fh_data = json.load(fh)
fh.close()
Expand Down
4 changes: 2 additions & 2 deletions src/sonic-daemon-base/sonic_daemon_base/daemon_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

# Port config information
PORT_CONFIG = 'port_config.ini'
PLATFORM_CAP = 'platform.json'
PLATFORM_JSON = 'platform.json'

EEPROM_MODULE_NAME = 'eeprom'
EEPROM_CLASS_NAME = 'board'
Expand Down Expand Up @@ -152,7 +152,7 @@ def get_path_to_port_config_file(self):
(platform_path, hwsku_path) = self.get_path_to_platform_and_hwsku()

# First check for the presence of the new 'platform.json' file
port_config_file_path = "/".join([platform_path, PLATFORM_CAP])
port_config_file_path = "/".join([platform_path, PLATFORM_JSON])
if not os.path.isfile(port_config_file_path):

# platform.json doesn't exist. Try loading the legacy 'port_config.ini' file
Expand Down

0 comments on commit 2f17452

Please sign in to comment.