diff options
| author | FUJITA Tomonori <fujita.tomonori@gmail.com> | 2019-10-21 12:49:02 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@gmail.com> | 2019-10-21 13:21:10 +0900 |
| commit | 19e99002f574a06b00738e3529bae2a4869ccce9 (patch) | |
| tree | 07833f40820e68388fdd57994c01dfe56bfff194 /test | |
| parent | 2457948919d2ed295904adfd4de61409ed78c7e2 (diff) | |
test: rm pipework functions
not used anymore.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/bagpipe.py | 6 | ||||
| -rw-r--r-- | test/lib/base.py | 15 | ||||
| -rw-r--r-- | test/scenario_test/README.md | 9 |
3 files changed, 0 insertions, 30 deletions
diff --git a/test/lib/bagpipe.py b/test/lib/bagpipe.py index 43e1dcc0..02c29ac1 100644 --- a/test/lib/bagpipe.py +++ b/test/lib/bagpipe.py @@ -71,9 +71,3 @@ class BagpipeContainer(BGPContainer): local(str(cmd), capture=True) cmd = 'docker exec {0} service bagpipe-bgp restart'.format(self.name) local(cmd, capture=True) - - def pipework(self, bridge, ip_addr, intf_name=""): - super(BagpipeContainer, self).pipework(bridge, ip_addr, intf_name) - self.create_config() - if self.is_running: - self.reload_config() diff --git a/test/lib/base.py b/test/lib/base.py index da0ff489..30799aaa 100644 --- a/test/lib/base.py +++ b/test/lib/base.py @@ -292,21 +292,6 @@ class Container(object): self.is_running = False return ret - def pipework(self, bridge, ip_addr, intf_name=""): - if not self.is_running: - print(yellow('call run() before pipeworking')) - return - c = CmdBuffer(' ') - c << "pipework {0}".format(bridge.name) - - if intf_name != "": - c << "-i {0}".format(intf_name) - else: - intf_name = "eth1" - c << "{0} {1}".format(self.docker_name(), ip_addr) - self.ip_addrs.append((intf_name, ip_addr, bridge.name)) - try_several_times(lambda: local(str(c))) - def local(self, cmd, capture=False, stream=False, detach=False, tty=True): if stream: dckr = Client(timeout=120, version='auto') diff --git a/test/scenario_test/README.md b/test/scenario_test/README.md index 2b3d9733..9b836e12 100644 --- a/test/scenario_test/README.md +++ b/test/scenario_test/README.md @@ -53,15 +53,6 @@ Server: Execute the following commands inside the VM to install the dependencies: -1. Install pip and [pipework](https://github.com/jpetazzo/pipework). - - ```shell - $ sudo apt-get update - $ sudo apt-get install git python3-pip python3-dev iputils-arping bridge-utils lv - $ sudo wget https://raw.github.com/jpetazzo/pipework/master/pipework -O /usr/local/bin/pipework - $ sudo chmod 755 /usr/local/bin/pipework - ``` - 1. Get docker images. Download docker images pertaining to GoBGP testing. |