Skip to content

Commit

Permalink
Migrating the NAT vs tests from Click to direct DB access (sonic-net#…
Browse files Browse the repository at this point in the history 
…2278)

*Migrate NAT vs tests from using click commands to direct DB access.
  • Loading branch information
@AkhileshSamineni
AkhileshSamineni authored May 17, 2022
1 parent b84fc4f commit 341a654
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 29 deletions.
88 changes: 88 additions & 0 deletions tests/conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,94 @@ def warm_restart_swss(self, enable):
fvs = swsscommon.FieldValuePairs([("enable",enable)])
tbl.set("swss", fvs)

# nat
def nat_mode_set(self, value):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "NAT_GLOBAL")
fvs = swsscommon.FieldValuePairs([("admin_mode", value)])
tbl.set("Values", fvs)
time.sleep(1)

def nat_timeout_set(self, value):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "NAT_GLOBAL")
fvs = swsscommon.FieldValuePairs([("nat_timeout", value)])
tbl.set("Values", fvs)
time.sleep(1)

def nat_udp_timeout_set(self, value):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "NAT_GLOBAL")
fvs = swsscommon.FieldValuePairs([("nat_udp_timeout", value)])
tbl.set("Values", fvs)
time.sleep(1)

def nat_tcp_timeout_set(self, value):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "NAT_GLOBAL")
fvs = swsscommon.FieldValuePairs([("nat_tcp_timeout", value)])
tbl.set("Values", fvs)
time.sleep(1)

def add_nat_basic_entry(self, external, internal):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "STATIC_NAT")
fvs = swsscommon.FieldValuePairs([("local_ip", internal)])
tbl.set(external, fvs)
time.sleep(1)

def del_nat_basic_entry(self, external):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "STATIC_NAT")
tbl._del(external)
time.sleep(1)

def add_nat_udp_entry(self, external, extport, internal, intport):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "STATIC_NAPT")
fvs = swsscommon.FieldValuePairs([("local_ip", internal), ("local_port", intport)])
tbl.set(external + "|UDP|" + extport, fvs)
time.sleep(1)

def del_nat_udp_entry(self, external, extport):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "STATIC_NAPT")
tbl._del(external + "|UDP|" + extport)
time.sleep(1)

def add_twice_nat_basic_entry(self, external, internal, nat_type, twice_nat_id):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "STATIC_NAT")
fvs = swsscommon.FieldValuePairs([("local_ip", internal), ("nat_type", nat_type), ("twice_nat_id", twice_nat_id)])
tbl.set(external, fvs)
time.sleep(1)

def del_twice_nat_basic_entry(self, external):
self.del_nat_basic_entry(external)

def add_twice_nat_udp_entry(self, external, extport, internal, intport, nat_type, twice_nat_id):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
tbl = swsscommon.Table(cdb, "STATIC_NAPT")
fvs = swsscommon.FieldValuePairs([("local_ip", internal), ("local_port", intport), ("nat_type", nat_type), ("twice_nat_id", twice_nat_id)])
tbl.set(external + "|UDP|" + extport, fvs)
time.sleep(1)

def del_twice_nat_udp_entry(self, external, extport):
self.del_nat_udp_entry(external, extport)

def set_nat_zone(self, interface, nat_zone):
cdb = swsscommon.DBConnector(4, self.redis_sock, 0)
if interface.startswith("PortChannel"):
tbl_name = "PORTCHANNEL_INTERFACE"
elif interface.startswith("Vlan"):
tbl_name = "VLAN_INTERFACE"
else:
tbl_name = "INTERFACE"
tbl = swsscommon.Table(cdb, tbl_name)
fvs = swsscommon.FieldValuePairs([("nat_zone", nat_zone)])
tbl.set(interface, fvs)
time.sleep(1)

# deps: acl, crm, fdb
def setReadOnlyAttr(self, obj, attr, val):
db = swsscommon.DBConnector(swsscommon.ASIC_DB, self.redis_sock, 0)
Expand Down
55 changes: 26 additions & 29 deletions tests/test_nat.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,10 @@ def setup_db(self, dvs):
self.config_db = dvs.get_config_db()

def set_interfaces(self, dvs):
fvs = {"NULL": "NULL"}
self.config_db.create_entry("INTERFACE", "Ethernet0|67.66.65.1/24", fvs)
self.config_db.create_entry("INTERFACE", "Ethernet4|18.18.18.1/24", fvs)
self.config_db.create_entry("INTERFACE", "Ethernet0", fvs)
self.config_db.create_entry("INTERFACE", "Ethernet4", fvs)
dvs.runcmd("config interface startup Ethernet0")
dvs.runcmd("config interface startup Ethernet4")
dvs.interface_ip_add("Ethernet0", "67.66.65.1/24")
dvs.interface_ip_add("Ethernet4", "18.18.18.1/24")
dvs.port_admin_set("Ethernet0", "up")
dvs.port_admin_set("Etherent4", "up")

dvs.servers[0].runcmd("ip link set down dev eth0")
dvs.servers[0].runcmd("ip link set up dev eth0")
Expand All @@ -33,7 +30,7 @@ def set_interfaces(self, dvs):
dvs.servers[1].runcmd("ifconfig eth0 18.18.18.2/24")
dvs.servers[1].runcmd("ip route add default via 18.18.18.1")

dvs.runcmd("config nat add interface Ethernet0 -nat_zone 1")
dvs.set_nat_zone("Ethernet0", "1")

time.sleep(1)

Expand All @@ -48,10 +45,10 @@ def test_NatGlobalTable(self, dvs, testlog):
self.setup_db(dvs)

# enable NAT feature
dvs.runcmd("config nat feature enable")
dvs.runcmd("config nat set timeout 450")
dvs.runcmd("config nat set udp-timeout 360")
dvs.runcmd("config nat set tcp-timeout 900")
dvs.nat_mode_set("enabled")
dvs.nat_timeout_set("450")
dvs.nat_udp_timeout_set("360")
dvs.nat_tcp_timeout_set("900")

# check NAT global values in appdb
self.app_db.wait_for_n_keys("NAT_GLOBAL_TABLE", 1)
Expand Down Expand Up @@ -82,7 +79,7 @@ def test_AddNatStaticEntry(self, dvs, testlog):
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")
dvs.add_nat_basic_entry("67.66.65.1", "18.18.18.2")

# check the entry in the config db
self.config_db.wait_for_n_keys("STATIC_NAT", 1)
Expand Down Expand Up @@ -115,7 +112,7 @@ def test_DelNatStaticEntry(self, dvs, testlog):
self.setup_db(dvs)

# delete a static nat entry
dvs.runcmd("config nat remove static basic 67.66.65.1 18.18.18.2")
dvs.del_nat_basic_entry("67.66.65.1")

# check the entry is no there in the config db
self.config_db.wait_for_n_keys("STATIC_NAT", 0)
Expand All @@ -134,7 +131,7 @@ def test_AddNaPtStaticEntry(self, dvs, testlog):
dvs.servers[0].runcmd("ping -c 1 18.18.18.2")

# add a static nat entry
dvs.runcmd("config nat add static udp 67.66.65.1 670 18.18.18.2 180")
dvs.add_nat_udp_entry("67.66.65.1", "670", "18.18.18.2", "180")

# check the entry in the config db
self.config_db.wait_for_n_keys("STATIC_NAPT", 1)
Expand Down Expand Up @@ -165,7 +162,7 @@ def test_DelNaPtStaticEntry(self, dvs, testlog):
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")
dvs.del_nat_udp_entry("67.66.65.1", "670")

# check the entry is no there in the config db
self.config_db.wait_for_n_keys("STATIC_NAPT", 0)
Expand All @@ -186,8 +183,8 @@ def test_AddTwiceNatEntry(self, dvs, testlog):
dvs.servers[1].runcmd("ping -c 1 67.66.65.2")

# add a twice nat entry
dvs.runcmd("config nat add static basic 67.66.65.2 18.18.18.1 -nat_type snat -twice_nat_id 9")
dvs.runcmd("config nat add static basic 67.66.65.1 18.18.18.2 -nat_type dnat -twice_nat_id 9")
dvs.add_twice_nat_basic_entry("67.66.65.2", "18.18.18.1", "snat", "9")
dvs.add_twice_nat_basic_entry("67.66.65.1", "18.18.18.2", "dnat", "9")

# check the entry in the config db
self.config_db.wait_for_n_keys("STATIC_NAT", 2)
Expand Down Expand Up @@ -220,8 +217,8 @@ def test_DelTwiceNatStaticEntry(self, dvs, testlog):
self.setup_db(dvs)

# delete a static nat entry
dvs.runcmd("config nat remove static basic 67.66.65.2 18.18.18.1")
dvs.runcmd("config nat remove static basic 67.66.65.1 18.18.18.2")
dvs.del_twice_nat_basic_entry("67.66.65.2")
dvs.del_twice_nat_basic_entry("67.66.65.1")

# check the entry is no there in the config db
self.config_db.wait_for_n_keys("STATIC_NAT", 0)
Expand All @@ -241,8 +238,8 @@ def test_AddTwiceNaPtEntry(self, dvs, testlog):
dvs.servers[1].runcmd("ping -c 1 67.66.65.2")

# add a twice nat entry
dvs.runcmd("config nat add static udp 67.66.65.2 670 18.18.18.1 181 -nat_type snat -twice_nat_id 7")
dvs.runcmd("config nat add static udp 67.66.65.1 660 18.18.18.2 182 -nat_type dnat -twice_nat_id 7")
dvs.add_twice_nat_udp_entry("67.66.65.2", "670", "18.18.18.1", "181", "snat", "7")
dvs.add_twice_nat_udp_entry("67.66.65.1", "660", "18.18.18.2", "182", "dnat", "7")

# check the entry in the config db
self.config_db.wait_for_n_keys("STATIC_NAPT", 2)
Expand Down Expand Up @@ -277,8 +274,8 @@ def test_DelTwiceNaPtStaticEntry(self, dvs, testlog):
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")
dvs.runcmd("config nat remove static udp 67.66.65.1 660 18.18.18.2 182")
dvs.del_twice_nat_udp_entry("67.66.65.2", "670")
dvs.del_twice_nat_udp_entry("67.66.65.1", "660")

# check the entry is not there in the config db
self.config_db.wait_for_n_keys("STATIC_NAPT", 0)
Expand All @@ -294,7 +291,7 @@ def test_VerifyConntrackTimeoutForNatEntry(self, dvs, testlog):
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")
dvs.add_nat_basic_entry("67.66.65.1", "18.18.18.2")

# check the conntrack timeout for static entry
def _check_conntrack_for_static_entry():
Expand All @@ -321,7 +318,7 @@ def _check_conntrack_for_static_entry():
wait_for_result(_check_conntrack_for_static_entry)

# delete a static nat entry
dvs.runcmd("config nat remove static basic 67.66.65.1 18.18.18.2")
dvs.del_nat_basic_entry("67.66.65.1")

def test_DoNotNatAclAction(self, dvs_acl, testlog):

Expand Down Expand Up @@ -360,7 +357,7 @@ def test_CrmSnatAndDnatEntryUsedCount(self, dvs, testlog):
dvs.servers[0].runcmd("ping -c 1 18.18.18.2")

# set pooling interval to 1
dvs.runcmd("crm config polling interval 1")
dvs.crm_poll_set("1")

dvs.setReadOnlyAttr('SAI_OBJECT_TYPE_SWITCH', 'SAI_SWITCH_ATTR_AVAILABLE_SNAT_ENTRY', '1000')
dvs.setReadOnlyAttr('SAI_OBJECT_TYPE_SWITCH', 'SAI_SWITCH_ATTR_AVAILABLE_DNAT_ENTRY', '1000')
Expand All @@ -376,7 +373,7 @@ def test_CrmSnatAndDnatEntryUsedCount(self, dvs, testlog):
avail_dnat_counter = dvs.getCrmCounterValue('STATS', 'crm_stats_dnat_entry_available')

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

#check the entry in asic db, 3 keys = SNAT, DNAT and DNAT_Pool
keys = self.asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_NAT_ENTRY", 3)
Expand Down Expand Up @@ -405,7 +402,7 @@ def test_CrmSnatAndDnatEntryUsedCount(self, dvs, testlog):
assert avail_dnat_counter - new_avail_dnat_counter == 1

# delete a static nat entry
dvs.runcmd("config nat remove static basic 67.66.65.1 18.18.18.2")
dvs.del_nat_basic_entry("67.66.65.1")

dvs.setReadOnlyAttr('SAI_OBJECT_TYPE_SWITCH', 'SAI_SWITCH_ATTR_AVAILABLE_SNAT_ENTRY', '1000')
dvs.setReadOnlyAttr('SAI_OBJECT_TYPE_SWITCH', 'SAI_SWITCH_ATTR_AVAILABLE_DNAT_ENTRY', '1000')
Expand Down

0 comments on commit 341a654

Please sign in to comment.