Page MenuHomeVyOS Platform
Files F119063173

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py
index d4f152828..09ca89721 100755
--- a/smoketest/scripts/cli/test_container.py
+++ b/smoketest/scripts/cli/test_container.py
@@ -1,88 +1,80 @@
#!/usr/bin/env python3
#
# Copyright (C) 2021 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import unittest
import json
from base_vyostest_shim import VyOSUnitTestSHIM
from vyos.configsession import ConfigSession
from vyos.configsession import ConfigSessionError
from vyos.util import cmd
from vyos.util import process_named_running
from vyos.util import read_file
base_path = ['container']
cont_image = 'busybox'
-prefix = '192.0.2.0/24'
+prefix = '192.168.205.0/24'
net_name = 'NET01'
PROCESS_NAME = 'podman'
def cmd_to_json(command):
c = cmd(command + ' --format=json')
data = json.loads(c)[0]
return data
class TesContainer(VyOSUnitTestSHIM.TestCase):
- # We need real internet connection to pull images
- def setUp(self):
+
+ def test_01_basic_container(self):
+ cont_name = 'c1'
+
self.cli_set(['interfaces', 'ethernet', 'eth0', 'address', '10.0.2.15/24'])
self.cli_set(['protocols', 'static', 'route', '0.0.0.0/0', 'next-hop', '10.0.2.2'])
self.cli_set(['system', 'name-server', '1.1.1.1'])
self.cli_set(['system', 'name-server', '8.8.8.8'])
- def tearDown(self):
- self.cli_delete(['interfaces', 'ethernet', 'eth0', 'address', '10.0.2.15/24'])
- self.cli_delete(['protocols', 'static', 'route', '0.0.0.0/0', 'next-hop', '10.0.2.2'])
- self.cli_delete(['system', 'name-server', '1.1.1.1'])
- self.cli_delete(['system', 'name-server', '8.8.8.8'])
- self.cli_delete(base_path)
- self.cli_commit()
-
- def test_01_basic_container(self):
- cont_name = 'c1'
self.cli_set(base_path + ['name', cont_name, 'image', cont_image])
self.cli_set(base_path + ['name', cont_name, 'allow-host-networks'])
# commit changes
self.cli_commit()
# Check for running process
self.assertTrue(process_named_running(PROCESS_NAME))
def test_02_container_network(self):
cont_name = 'c2'
- cont_ip = '192.0.2.25'
+ cont_ip = '192.168.205.25'
self.cli_set(base_path + ['network', net_name, 'ipv4-prefix', prefix])
self.cli_set(base_path + ['name', cont_name, 'image', cont_image])
self.cli_set(base_path + ['name', cont_name, 'network', net_name, 'address', cont_ip])
# commit changes
self.cli_commit()
n = cmd_to_json(f'sudo podman network inspect {net_name}')
json_subnet = n['plugins'][0]['ipam']['ranges'][0][0]['subnet']
c = cmd_to_json(f'sudo podman container inspect {cont_name}')
json_ip = c['NetworkSettings']['Networks'][net_name]['IPAddress']
self.assertEqual(json_subnet, prefix)
self.assertEqual(json_ip, cont_ip)
if __name__ == '__main__':
unittest.main(verbosity=2)

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 6, 8:06 AM (1 d, 21 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4616674
Default Alt Text
(3 KB)

Event Timeline