Set FEC to reed-solomon if the port speed is 100G (#1383)

* Set FEC to reed-solomon if the port speed is 100G
sonic-net · Feb 9, 2018 · a145f2c · a145f2c
1 parent ecf5c8d
commit a145f2c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
@@ -418,6 +418,8 @@ def parse_xml(filename, platform=None, port_config_file=None):
 
     for port_name in port_speeds:
         ports.setdefault(port_name, {})['speed'] = port_speeds[port_name]
+        if port_speeds[port_name] == '100000':
+            ports.setdefault(port_name, {})['fec'] = 'rs'
     for port_name in port_descriptions:
         ports.setdefault(port_name, {})['description'] = port_descriptions[port_name]
 

diff --git a/src/sonic-config-engine/tests/sample_output/ports.json b/src/sonic-config-engine/tests/sample_output/ports.json
@@ -22,7 +22,7 @@
     },
     {
         "PORT_TABLE:Ethernet12": {
-            "speed": "1000000",
+            "speed": "100000",
             "description": "Interface description"
         },
         "OP": "SET"

diff --git a/src/sonic-config-engine/tests/simple-sample-graph.xml b/src/sonic-config-engine/tests/simple-sample-graph.xml
@@ -260,7 +260,7 @@
           <MultiPortsInterface>false</MultiPortsInterface>
           <PortName>0</PortName>
           <Priority>0</Priority>
-          <Speed>1000000</Speed>
+          <Speed>100000</Speed>
           <Description>Interface description</Description>
         </a:EthernetInterface>
       </EthernetInterfaces>

diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
@@ -140,3 +140,6 @@ def test_minigraph_ethernet_interfaces(self):
         argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORT[\'Ethernet8\']"'
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "{'alias': 'fortyGigE0/8', 'lanes': '37,38,39,40', 'description': 'Interface description', 'speed': '40000'}")
+        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORT[\'Ethernet12\']"'
+        output = self.run_script(argument)
+        self.assertEqual(output.strip(), "{'alias': 'fortyGigE0/12', 'lanes': '33,34,35,36', 'fec': 'rs', 'speed': '100000', 'description': 'Interface description'}")