starlingx
/
test
Code Issues Proposed changes

A lab exmple is given in conts/lab.py with ips that are commonly used 

in virtual environment.
When the OAM IPs in the example matches partially with what is specified
in testcase config file, the test framework will get confused and return
an error.

This commit is to put the example into comments so there will be no
conflict with actual system under test.

Change-Id: I112aaca08d8bcc6959ffa295216cb2a4d32feda8
Closes-Bug: 1839383
Signed-off-by: Yang Liu <yang.liu@windriver.com>
This commit is contained in:
Yang Liu 2019-08-07 16:36:13 -04:00
parent 7a43f49c35
commit 299667bada
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
automated-pytest-suite/consts/lab.py
View File

@ -5,17 +5,22 @@
#
class Labs:
class Labs(object):
# Place for existing stx systems for convenience.
# --lab <short_name> can be used in cmdline specify an existing system
# --lab <short_name> can be used in cmdline to specify an existing system
EXAMPLE = {
'short_name': 'my_server',
'name': 'my_server.com',
'floating ip': '10.10.10.2',
'controller-0 ip': '10.10.10.3',
'controller-1 ip': '10.10.10.4',
}
# Each lab should be a dictionary such as following. The short_name and name are free style
# strings while the floating IP and controller-0/1 IPs should map to what is shown in system
# oam-show
# STX_SYS1 = {
# 'short_name': 'my_server1',
# 'name': 'my_server1.com',
# 'floating ip': '10.10.10.2',
# 'controller-0 ip': '10.10.10.3',
# 'controller-1 ip': '10.10.10.4',
# }
pass
def update_lab(lab_dict_name=None, lab_name=None, floating_ip=None, **kwargs):
@ -128,7 +133,7 @@ def add_lab_entry(floating_ip, dict_name=None, short_name=None, name=None,
return lab_dict
class NatBoxes:
class NatBoxes(object):
# Place for existing NatBox that are already configured
NAT_BOX_HW_EXAMPLE = {
'name': 'nat_hw',