diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2017-03-16 16:31:14 +0900 |
|---|---|---|
| committer | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2017-03-16 16:31:14 +0900 |
| commit | a7932d708921c5b2ed4f3fa7ce608a1449146048 (patch) | |
| tree | ced446d1966c872154d5235dd1bd927e547f4613 | |
| parent | ecc9b5631eb68a5148affce56765fe661bf1f2f8 (diff) | |
test/lib/quagga: Avoid ambiguous command "en"
With the newer version of Quagga, "en" command will be regarded as an
"Ambiguous command", because there are two commands "enable" and "end".
This patch replaces "en" command with "enable" command, and fixes this
problem.
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
| -rw-r--r-- | test/lib/quagga.py | 2 | ||||
| -rw-r--r-- | test/scenario_test/zapi_v3_test.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/lib/quagga.py b/test/lib/quagga.py index f0034459..897648ae 100644 --- a/test/lib/quagga.py +++ b/test/lib/quagga.py @@ -246,7 +246,7 @@ class QuaggaBGPContainer(BGPContainer): cmd = [cmd] cmd = ' '.join("-c '{0}'".format(c) for c in cmd) if config: - return self.local("vtysh -d bgpd -c 'en' -c 'conf t' -c 'router bgp {0}' {1}".format(self.asn, cmd), capture=True) + return self.local("vtysh -d bgpd -c 'enable' -c 'conf t' -c 'router bgp {0}' {1}".format(self.asn, cmd), capture=True) else: return self.local("vtysh -d bgpd {0}".format(cmd), capture=True) diff --git a/test/scenario_test/zapi_v3_test.py b/test/scenario_test/zapi_v3_test.py index 3c35903c..09c73329 100644 --- a/test/scenario_test/zapi_v3_test.py +++ b/test/scenario_test/zapi_v3_test.py @@ -70,10 +70,10 @@ class GoBGPTestBase(unittest.TestCase): self.g2.local('ip netns exec ns01 ip li set up dev lo') self.g2.local('ip netns exec ns02 ip li set up dev lo') - self.g1.local("vtysh -c 'en' -c 'conf t' -c 'vrf 1 netns ns01'") - self.g1.local("vtysh -c 'en' -c 'conf t' -c 'vrf 2 netns ns02'") - self.g2.local("vtysh -c 'en' -c 'conf t' -c 'vrf 1 netns ns01'") - self.g2.local("vtysh -c 'en' -c 'conf t' -c 'vrf 2 netns ns02'") + self.g1.local("vtysh -c 'enable' -c 'conf t' -c 'vrf 1 netns ns01'") + self.g1.local("vtysh -c 'enable' -c 'conf t' -c 'vrf 2 netns ns02'") + self.g2.local("vtysh -c 'enable' -c 'conf t' -c 'vrf 1 netns ns01'") + self.g2.local("vtysh -c 'enable' -c 'conf t' -c 'vrf 2 netns ns02'") self.g1.local("gobgp vrf add vrf01 id 1 rd 1:1 rt both 1:1") self.g1.local("gobgp vrf add vrf02 id 2 rd 2:2 rt both 2:2") |