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.

Sign up for GitHub

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

[vs tests] Disable NAT tests to unblock Jenkins #1179

Merged
merged 2 commits into from
Jan 23, 2020
Merged

[vs tests] Disable NAT tests to unblock Jenkins #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83651d4
[vs tests] Disable NAT tests to unblock Jenkins
daall Jan 22, 2020
0d5b15c
Use pytest to skip test execution instead of comments
daall Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,10 @@ def __init__(self, name=None, imgname=None, keeptb=False, fakeplatform=None):
self.syncd = ['syncd']
self.rtd = ['fpmsyncd', 'zebra']
self.teamd = ['teamsyncd', 'teammgrd']
self.natd = ['natsyncd', 'natmgrd']
self.alld = self.basicd + self.swssd + self.syncd + self.rtd + self.teamd + self.natd
# FIXME: We need to verify that NAT processes are running, once the
# appropriate changes are merged into sonic-buildimage
# self.natd = ['natsyncd', 'natmgrd']
self.alld = self.basicd + self.swssd + self.syncd + self.rtd + self.teamd # + self.natd
self.client = docker.from_env()

if subprocess.check_call(["/sbin/modprobe", "team"]) != 0:
Expand Down
54 changes: 25 additions & 29 deletions tests/test_nat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import pdb
import os


# FIXME: These tests depend on changes in sonic-buildimage, we need to reenable
# them once those changes are merged.
@pytest.mark.skip(reason="Depends on changes in sonic-buildimage")
class TestNatFeature(object):
def setup_db(self, dvs):
self.appdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
Expand Down Expand Up @@ -53,9 +55,9 @@ def clear_interfaces(self, dvs):

def test_NatGlobalTable(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# enable NAT feature
# enable NAT feature
dvs.runcmd("config nat feature enable")
dvs.runcmd("config nat set timeout 450")
dvs.runcmd("config nat set udp-timeout 360")
Expand All @@ -73,36 +75,36 @@ def test_NatGlobalTable(self, dvs, testlog):

def test_NatInterfaceZone(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)
self.set_interfaces(dvs)

# check NAT zone is set for interface in app db
tbl = swsscommon.Table(self.appdb, "INTF_TABLE")
keys = tbl.getKeys()

(status, fvs) = tbl.get("Ethernet0")

assert fvs==(('NULL', 'NULL'), ('nat_zone', '1'))
assert fvs==(('NULL', 'NULL'), ('nat_zone', '1'))


def test_AddNatStaticEntry(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# get neighbor and arp entry
dvs.servers[0].runcmd("ping -c 1 18.18.18.2")

# add a static nat entry
dvs.runcmd("config nat add static basic 67.66.65.1 18.18.18.2")

# check the entry in the config db
tbl = swsscommon.Table(self.configdb, "STATIC_NAT")
entry = tbl.getKeys()
assert len(entry) == 1

(status, fvs) = tbl.get("67.66.65.1")

assert fvs==(('local_ip', '18.18.18.2'),)
assert fvs==(('local_ip', '18.18.18.2'),)

# check the entry in app db
tbl = swsscommon.Table(self.appdb, "NAT_TABLE")
Expand All @@ -111,7 +113,7 @@ def test_AddNatStaticEntry(self, dvs, testlog):

(status, fvs) = tbl.get("67.66.65.1")

assert fvs== (('translated_ip', '18.18.18.2'), ('nat_type', 'dnat'), ('entry_type', 'static'))
assert fvs== (('translated_ip', '18.18.18.2'), ('nat_type', 'dnat'), ('entry_type', 'static'))

#check the entry in asic db
tbl = swsscommon.Table(self.asicdb, "ASIC_STATE:SAI_OBJECT_TYPE_NAT_ENTRY")
Expand All @@ -126,7 +128,7 @@ def test_AddNatStaticEntry(self, dvs, testlog):

def test_DelNatStaticEntry(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# delete a static nat entry
dvs.runcmd("config nat remove static basic 67.66.65.1 18.18.18.2")
Expand All @@ -148,7 +150,7 @@ def test_DelNatStaticEntry(self, dvs, testlog):

def test_AddNaPtStaticEntry(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# get neighbor and arp entry
dvs.servers[0].runcmd("ping -c 1 18.18.18.2")
Expand All @@ -163,7 +165,7 @@ def test_AddNaPtStaticEntry(self, dvs, testlog):

(status, fvs) = tbl.get("67.66.65.1|UDP|670")

assert fvs==(('local_ip', '18.18.18.2'),('local_port', '180'))
assert fvs==(('local_ip', '18.18.18.2'),('local_port', '180'))

# check the entry in app db
tbl = swsscommon.Table(self.appdb, "NAPT_TABLE:UDP")
Expand All @@ -178,7 +180,7 @@ def test_AddNaPtStaticEntry(self, dvs, testlog):
tbl = swsscommon.Table(self.asicdb, "ASIC_STATE:SAI_OBJECT_TYPE_NAT_ENTRY")
keys = tbl.getKeys()
assert len(keys) == 2

for key in keys:
if (key.find("dst_ip:67.66.65.1")) and (key.find("key.l4_dst_port:670")):
assert True
Expand All @@ -189,7 +191,7 @@ def test_AddNaPtStaticEntry(self, dvs, testlog):

def test_DelNaPtStaticEntry(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# delete a static nat entry
dvs.runcmd("config nat remove static udp 67.66.65.1 670 18.18.18.2 180")
Expand All @@ -209,10 +211,9 @@ def test_DelNaPtStaticEntry(self, dvs, testlog):
key = tbl.getKeys()
assert key == ()


def test_AddTwiceNatEntry(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# get neighbor and arp entry
dvs.servers[0].runcmd("ping -c 1 18.18.18.2")
Expand Down Expand Up @@ -260,7 +261,7 @@ def test_AddTwiceNatEntry(self, dvs, testlog):

def test_DelTwiceNatStaticEntry(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# delete a static nat entry
dvs.runcmd("config nat remove static basic 67.66.65.2 18.18.18.1")
Expand All @@ -281,10 +282,9 @@ def test_DelTwiceNatStaticEntry(self, dvs, testlog):
key = tbl.getKeys()
assert key == ()


def test_AddTwiceNaPtEntry(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# get neighbor and arp entry
dvs.servers[0].runcmd("ping -c 1 18.18.18.2")
Expand All @@ -306,20 +306,18 @@ def test_AddTwiceNaPtEntry(self, dvs, testlog):

assert fvs== (('nat_type', 'snat'), ('local_ip', '18.18.18.1'),('twice_nat_id', '7'), ('local_port', '181'))



# check the entry in app db
tbl = swsscommon.Table(self.appdb, "NAPT_TWICE_TABLE")
entry = tbl.getKeys()
assert len(entry) == 2

(status, fvs) = tbl.get("UDP:67.66.65.2:670:67.66.65.1:660")

assert fvs== (('translated_src_ip', '18.18.18.1'), ('translated_src_l4_port', '181'), ('translated_dst_ip', '18.18.18.2'), ('translated_dst_l4_port', '182'), ('entry_type', 'static'))
assert fvs== (('translated_src_ip', '18.18.18.1'), ('translated_src_l4_port', '181'), ('translated_dst_ip', '18.18.18.2'), ('translated_dst_l4_port', '182'), ('entry_type', 'static'))

(status, fvs) = tbl.get("UDP:18.18.18.2:182:18.18.18.1:181")

assert fvs== (('translated_src_ip', '67.66.65.1'), ('translated_src_l4_port', '660'),('translated_dst_ip', '67.66.65.2'),('translated_dst_l4_port', '670'), ('entry_type', 'static'))
assert fvs== (('translated_src_ip', '67.66.65.1'), ('translated_src_l4_port', '660'),('translated_dst_ip', '67.66.65.2'),('translated_dst_l4_port', '670'), ('entry_type', 'static'))

#check the entry in asic db
tbl = swsscommon.Table(self.asicdb, "ASIC_STATE:SAI_OBJECT_TYPE_NAT_ENTRY")
Expand All @@ -333,10 +331,9 @@ def test_AddTwiceNaPtEntry(self, dvs, testlog):
else:
assert False


def test_DelTwiceNaPtStaticEntry(self, dvs, testlog):
# initialize
self.setup_db(dvs)
self.setup_db(dvs)

# delete a static nat entry
dvs.runcmd("config nat remove static udp 67.66.65.2 670 18.18.18.1 181")
Expand All @@ -359,4 +356,3 @@ def test_DelTwiceNaPtStaticEntry(self, dvs, testlog):

# clear interfaces
self.clear_interfaces(dvs)