Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Remove quagga related code" #7831

Merged
merged 1 commit into from
Jun 10, 2021
Merged

Conversation

qiluo-msft
Copy link
Collaborator

Reverts #7476

It remove bgpd.conf.j2 and zebra.conf.j2, which is still used by sonic-config-engine unit test.

@qiluo-msft qiluo-msft requested review from lguohan and xumia as code owners June 9, 2021 11:23
@qiluo-msft qiluo-msft requested a review from shi-su June 9, 2021 11:23
@lguohan
Copy link
Collaborator

lguohan commented Jun 9, 2021

what does this break?

@qiluo-msft
Copy link
Collaborator Author

It broke sonic-config-engine unit test.
Sample output

12:13:24  ======================================================================
12:13:24  ERROR: test_bgpd_quagga (tests.test_j2files.TestJ2Files)
12:13:24  ----------------------------------------------------------------------
12:13:24  Traceback (most recent call last):
12:13:24    File "/sonic/src/sonic-config-engine/tests/test_j2files.py", line 99, in test_bgpd_quagga
12:13:24      self.run_script(argument)
12:13:24    File "/sonic/src/sonic-config-engine/tests/test_j2files.py", line 32, in run_script
12:13:24      output = subprocess.check_output(self.script_file + ' ' + argument, shell=True)
12:13:24    File "/usr/lib/python2.7/subprocess.py", line 223, in check_output
12:13:24      raise CalledProcessError(retcode, cmd, output=output)
12:13:24  CalledProcessError: Command 'python2 /sonic/src/sonic-config-engine/tests/../sonic-cfggen -m /sonic/src/sonic-config-engine/tests/t0-sample-graph.xml -p /sonic/src/sonic-config-engine/tests/t0-sample-port-config.ini -t /sonic/src/sonic-config-engine/tests/../../../dockers/docker-fpm-quagga/bgpd.conf.j2 > /sonic/src/sonic-config-engine/tests/output' returned non-zero exit status 1
12:13:24  
12:13:24  ======================================================================
12:13:24  ERROR: test_zebra_quagga (tests.test_j2files.TestJ2Files)
12:13:24  ----------------------------------------------------------------------
12:13:24  Traceback (most recent call last):
12:13:24    File "/sonic/src/sonic-config-engine/tests/test_j2files.py", line 108, in test_zebra_quagga
12:13:24      self.run_script(argument)
12:13:24    File "/sonic/src/sonic-config-engine/tests/test_j2files.py", line 32, in run_script
12:13:24      output = subprocess.check_output(self.script_file + ' ' + argument, shell=True)
12:13:24    File "/usr/lib/python2.7/subprocess.py", line 223, in check_output
12:13:24      raise CalledProcessError(retcode, cmd, output=output)
12:13:24  CalledProcessError: Command 'python2 /sonic/src/sonic-config-engine/tests/../sonic-cfggen -m /sonic/src/sonic-config-engine/tests/t0-sample-graph.xml -p /sonic/src/sonic-config-engine/tests/t0-sample-port-config.ini -t /sonic/src/sonic-config-engine/tests/../../../dockers/docker-fpm-quagga/zebra.conf.j2 > /sonic/src/sonic-config-engine/tests/output' returned non-zero exit status 1

@qiluo-msft qiluo-msft merged commit 658ed4f into master Jun 10, 2021
@qiluo-msft qiluo-msft deleted the revert-7476-rm_quagga branch June 10, 2021 01:52
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
Reverts sonic-net#7476
It remove bgpd.conf.j2 and zebra.conf.j2, which is still used by sonic-config-engine unit test.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants