Sai challenger staging - sync to main, Plvision test-framework-extension branches

.github/workflows/dash-saithrift-client-bldr-docker-acr.yml

@@ -53,4 +53,4 @@ jobs:
     - name: Build dash-saithrift-client-bldr image 
       run:  DOCKER_FLAGS=$docker_fg_flags make docker-saithrift-client-bldr
     - name: Publish dash-saithrift-client-bldr docker image
-      run: make docker-publish-saichallenger-client
+      run: make docker-publish-saithrift-client-bldr

.wordlist.txt

@@ -258,6 +258,7 @@ io
 IP
 IPs
 ip
+ips
 IPDK
 IPU
 IPUs
@@ -426,6 +427,7 @@ reconvergence
 README
 READMEs
 README's
+reconvergence
 RedirectRuleResimulatedUf
 redis
 renderer

dash-pipeline/SAI/templates/saiapi.cpp.j2

@@ -119,17 +119,20 @@ sai_status_t sai_create_{{ table.name }}(
     {% else %}
     // Search the action 
     for (uint32_t i = 0; i < attr_count; i++) {
-        switch(attr_list[i].value.s32) {
-            {% for action in table.actions %}
-            case SAI_{{ table.name | upper }}_ACTION_{{ action.name | upper }}: {
-                actionId = {{action.id}}; 
-                expectedParams = {{ action.params|length }};
-                break;
+        if (SAI_{{ table.name | upper }}_ATTR_ACTION == attr_list[i].id)
+        {
+            switch(attr_list[i].value.s32) {
+                {% for action in table.actions %}
+                case SAI_{{ table.name | upper }}_ACTION_{{ action.name | upper }}: {
+                    actionId = {{action.id}}; 
+                    expectedParams = {{ action.params|length }};
+                    break;
+                }
+                {% endfor %}
             }
-            {% endfor %}
+            // only one action
+            break;
         }
-        // only one action
-        break;
     }
     {% endif %}
     action->set_action_id(actionId);

dash-pipeline/SAI/templates/utils.cpp.j2

@@ -152,8 +152,8 @@ grpc::StatusCode MutateTableEntry(p4::v1::TableEntry *entry, p4::v1::Update_Type
         LOG("GRPC call Write::" << updateTypeStr(updateType) << " OK" << entry->ShortDebugString() << std::endl);
     }
     else {
-        LOG("GRPC ERROR["<< status.error_code() <<"]: " << status.error_message() << ", " << status.error_details());
-        LOG("GRPC call Write::" << updateTypeStr(updateType) << " ERROR: " << std::endl << entry->ShortDebugString());
+        LOG("GRPC ERROR["<< status.error_code() <<"]: " << status.error_message() << ", " << status.error_details() << std::endl);
+        LOG("GRPC call Write::" << updateTypeStr(updateType) << " ERROR: " << std::endl << entry->ShortDebugString() << std::endl);
     }
     //MILIND?? What is this? reference release? memory release?
     entity->release_table_entry();
@@ -163,13 +163,12 @@ grpc::StatusCode MutateTableEntry(p4::v1::TableEntry *entry, p4::v1::Update_Type
 bool InsertInTable(p4::v1::TableEntry *entry, sai_object_id_t *objId) {
     auto retCode = MutateTableEntry(entry, p4::v1::Update_Type_INSERT);
     if (grpc::StatusCode::OK != retCode) {
-        delete entry;
         return false;
     }
 
     tableLock.lock();
     if (*objId == 0) {
-        *objId = nextId++;
+        *objId = NextObjIndex();
     }
     tableEntryMap[*objId] = entry;
     tableLock.unlock();

dash-pipeline/tests/saithrift/ptf/vnet/test_saithrift_vnet.py

@@ -93,10 +93,9 @@ def setUp(self):
 
             dip = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
                                           addr=sai_thrift_ip_addr_t(ip4=self.dst_ca_ip))
-            # TODO: Enable ACL rule
-            #self.out_acl_rule_id = sai_thrift_create_dash_acl_rule(self.client, dash_acl_group_id=self.out_acl_group_id,
-            #                                           dip=dip, priority=10, action=SAI_DASH_ACL_RULE_ACTION_PERMIT)
-            #assert(status == SAI_STATUS_SUCCESS)
+
+            self.out_acl_rule_id = sai_thrift_create_dash_acl_rule(self.client, dash_acl_group_id=self.out_acl_group_id, priority=10, action=SAI_DASH_ACL_RULE_ACTION_PERMIT)
+            assert(status == SAI_STATUS_SUCCESS)
 
             ca_prefix = sai_thrift_ip_prefix_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
                                                addr=sai_thrift_ip_addr_t(ip4="10.1.0.0"),
@@ -214,7 +213,7 @@ def runTest(self):
             send_packet(self, 0, vxlan_pkt)
             print("\nVerifying packet...\n", self.pkt_exp.__repr__())
             verify_packet(self, self.pkt_exp, 0)
-            print ("test_sai_thrift_outbound_udp_pkt_test OK")
+            print ("TestSaiThrift_outbound_udp_pkt OK")
         except AssertionError as ae:
             self.failure_teardown()
             raise ae
@@ -225,8 +224,8 @@ def failure_teardown(self):
             status = sai_thrift_remove_outbound_ca_to_pa_entry(self.client, self.ocpe)
         if hasattr(self, "ore"):
             status = sai_thrift_remove_outbound_routing_entry(self.client, self.ore)
-        #if hasattr(self, "out_acl_rule_id"):
-        #    sai_thrift_remove_dash_acl_rule(self.client, self.out_acl_rule_id)
+        if hasattr(self, "out_acl_rule_id"):
+           sai_thrift_remove_dash_acl_rule(self.client, self.out_acl_rule_id)
         if hasattr(self, "e2v"):
             sai_thrift_remove_outbound_eni_to_vni_entry(self.client, self.e2v)
         if hasattr(self, "eam"):
@@ -249,34 +248,35 @@ def failure_teardown(self):
     def tearDown(self):
 
         # Delete in reverse order
-        if self.cleaned_up:
-            return
-        status = sai_thrift_remove_outbound_ca_to_pa_entry(self.client, self.ocpe)
-        assert(status == SAI_STATUS_SUCCESS)                        
+        if not self.cleaned_up:
+            status = sai_thrift_remove_outbound_ca_to_pa_entry(self.client, self.ocpe)
+            assert(status == SAI_STATUS_SUCCESS)                        
 
-        status = sai_thrift_remove_outbound_routing_entry(self.client, self.ore)
-        assert(status == SAI_STATUS_SUCCESS)
+            status = sai_thrift_remove_outbound_routing_entry(self.client, self.ore)
+            assert(status == SAI_STATUS_SUCCESS)
 
-        #status = sai_thrift_remove_dash_acl_rule(self.client, self.out_acl_rule_id)
-        #assert(status == SAI_STATUS_SUCCESS)
+            #status = sai_thrift_remove_dash_acl_rule(self.client, self.out_acl_rule_id)
+            #assert(status == SAI_STATUS_SUCCESS)
 
-        status = sai_thrift_remove_eni_ether_address_map_entry(self.client, self.eam)
-        assert(status == SAI_STATUS_SUCCESS)
+            status = sai_thrift_remove_eni_ether_address_map_entry(self.client, self.eam)
+            assert(status == SAI_STATUS_SUCCESS)
 
-        status = sai_thrift_remove_eni(self.client, self.eni)
-        assert(status == SAI_STATUS_SUCCESS)
+            status = sai_thrift_remove_eni(self.client, self.eni)
+            assert(status == SAI_STATUS_SUCCESS)
 
-        status = sai_thrift_remove_vnet(self.client, self.vnet)
-        assert(status == SAI_STATUS_SUCCESS)                        
+            status = sai_thrift_remove_vnet(self.client, self.vnet)
+            assert(status == SAI_STATUS_SUCCESS)                        
+
+            status = sai_thrift_remove_dash_acl_group(self.client, self.out_acl_group_id)
+            assert(status == SAI_STATUS_SUCCESS)
 
-        status = sai_thrift_remove_dash_acl_group(self.client, self.out_acl_group_id)
-        assert(status == SAI_STATUS_SUCCESS)
+            status = sai_thrift_remove_dash_acl_group(self.client, self.in_acl_group_id)
+            assert(status == SAI_STATUS_SUCCESS)
 
-        status = sai_thrift_remove_dash_acl_group(self.client, self.in_acl_group_id)
-        assert(status == SAI_STATUS_SUCCESS)
+            status = sai_thrift_remove_direction_lookup_entry(self.client, self.dle)
+            assert(status == SAI_STATUS_SUCCESS)
 
-        status = sai_thrift_remove_direction_lookup_entry(self.client, self.dle)
-        assert(status == SAI_STATUS_SUCCESS)
+            sai_thrift_remove_vip_entry(self.client, self.vpe)
+            assert(status == SAI_STATUS_SUCCESS)
 
-        sai_thrift_remove_vip_entry(self.client, self.vpe)
-        assert(status == SAI_STATUS_SUCCESS)
+        super(self.__class__, self).tearDown()