[P4Orch] Add support for SUBPORT in router_interface_manager. (#3891)

What I did
Added a new feature to the router_interface_manager that allows it to support SUBPORT interfaces.
Why I did it
This was done to make the system more flexible.

Author: divyagayathri-hcl

orchagent/p4orch/router_interface_manager.cpp

@@ -104,7 +104,16 @@ ReturnCodeOr<std::vector<sai_attribute_t>> getSaiAttrs(const P4RouterInterfaceEn
         attr.id = SAI_ROUTER_INTERFACE_ATTR_VLAN_ID;
         attr.value.oid = port.m_vlan_info.vlan_oid;
         break;
-    // TODO: add support for PORT::SUBPORT
+    case Port::SUBPORT:
+        attr.value.s32 = SAI_ROUTER_INTERFACE_TYPE_SUB_PORT;
+        attrs.push_back(attr);
+        attr.id = SAI_ROUTER_INTERFACE_ATTR_PORT_ID;
+        attr.value.oid = port.m_port_id;
+        attrs.push_back(attr);
+        attr.id = SAI_ROUTER_INTERFACE_ATTR_OUTER_VLAN_ID;
+        attr.value.oid = port.m_vlan_info.vlan_oid;
+        break;
+
     default:
         LOG_ERROR_AND_RETURN(ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM) << "Unsupported port type: " << port.m_type);
     }

orchagent/p4orch/tests/router_interface_manager_test.cpp

@@ -41,12 +41,17 @@ constexpr char *kPortName2 = "Ethernet2";
 constexpr sai_object_id_t kPortOid2 = 0x1fed3;
 constexpr uint32_t kMtu2 = 4500;
 
+constexpr char* kPortName10 = "Ethernet10";
+constexpr sai_object_id_t kPortOid10 = 0xabcfff;
+constexpr uint32_t kMtu10 = 9100;
+
 constexpr char *kRouterInterfaceId1 = "intf-3/4";
 constexpr sai_object_id_t kRouterInterfaceOid1 = 0x295100;
 const swss::MacAddress kMacAddress1("00:01:02:03:04:05");
 
 constexpr char *kRouterInterfaceId2 = "Ethernet20";
 constexpr sai_object_id_t kRouterInterfaceOid2 = 0x51411;
+constexpr sai_object_id_t kVlanOid2 = 0xffffff;
 const swss::MacAddress kMacAddress2("00:ff:ee:dd:cc:bb");
 
 const swss::MacAddress kZeroMacAddress("00:00:00:00:00:00");
@@ -55,7 +60,7 @@ constexpr char *kRouterIntfAppDbKey = R"({"match/router_interface_id":"intf-3/4"
 
 std::unordered_map<sai_attr_id_t, sai_attribute_value_t> CreateRouterInterfaceAttributeList(
     const sai_object_id_t &virtual_router_oid, const swss::MacAddress mac_address, const sai_object_id_t &port_oid,
-    const uint32_t mtu)
+    const uint32_t mtu, const bool sub_port = false, const sai_object_id_t& vlan_oid = 0)
 {
     std::unordered_map<sai_attr_id_t, sai_attribute_value_t> attr_list;
     sai_attribute_value_t attr_value;
@@ -69,7 +74,15 @@ std::unordered_map<sai_attr_id_t, sai_attribute_value_t> CreateRouterInterfaceAt
         attr_list[SAI_ROUTER_INTERFACE_ATTR_SRC_MAC_ADDRESS] = attr_value;
     }
 
-    attr_value.s32 = SAI_ROUTER_INTERFACE_TYPE_PORT;
+    if (sub_port)
+    {
+        attr_value.oid = vlan_oid;
+        attr_list[SAI_ROUTER_INTERFACE_ATTR_OUTER_VLAN_ID] = attr_value;
+
+        attr_value.s32 = SAI_ROUTER_INTERFACE_TYPE_SUB_PORT;
+    } else
+        attr_value.s32 = SAI_ROUTER_INTERFACE_TYPE_PORT;
+
     attr_list[SAI_ROUTER_INTERFACE_ATTR_TYPE] = attr_value;
 
     attr_value.oid = port_oid;
@@ -135,6 +148,15 @@ bool MatchCreateRouterInterfaceAttributeList(
             matched_attr_num++;
             break;
 
+        case SAI_ROUTER_INTERFACE_ATTR_OUTER_VLAN_ID:
+            if (attr_list[i].value.oid !=
+                expected_attr_list.at(SAI_ROUTER_INTERFACE_ATTR_OUTER_VLAN_ID)
+                    .oid) {
+              return false;
+            }
+            matched_attr_num++;
+            break;
+
         default:
             // Unexpected attribute present in attribute list
             return false;
@@ -248,14 +270,14 @@ class RouterInterfaceManagerTest : public ::testing::Test
     }
 
     void AddRouterInterfaceEntry(P4RouterInterfaceEntry &router_intf_entry, const sai_object_id_t port_oid,
-                                 const uint32_t mtu)
+                                 const uint32_t mtu, const bool sub_port = false, const sai_object_id_t vlan_oid = 0)
     {
         EXPECT_CALL(mock_sai_router_intf_,
                     create_router_interface(
-                        ::testing::NotNull(), Eq(gSwitchId), Eq(5),
+                        ::testing::NotNull(), Eq(gSwitchId), sub_port ? Eq(6) : Eq(5),
                         Truly(std::bind(MatchCreateRouterInterfaceAttributeList, std::placeholders::_1,
                                         CreateRouterInterfaceAttributeList(
-                                            gVirtualRouterId, router_intf_entry.src_mac_address, port_oid, mtu)))))
+                                            gVirtualRouterId, router_intf_entry.src_mac_address, port_oid, mtu, sub_port, vlan_oid)))))
             .WillOnce(DoAll(SetArgPointee<0>(router_intf_entry.router_interface_oid), Return(SAI_STATUS_SUCCESS)));
 
         const std::string router_intf_key =
@@ -277,6 +299,16 @@ TEST_F(RouterInterfaceManagerTest, CreateRouterInterfaceValidAttributes)
     ValidateRouterInterfaceEntry(router_intf_entry);
 }
 
+TEST_F(RouterInterfaceManagerTest, CreateRouterInterfaceWithSubport)
+{
+    P4RouterInterfaceEntry router_intf_entry(kRouterInterfaceId1, kPortName10,
+                                             kMacAddress1);
+    AddRouterInterfaceEntry(router_intf_entry, kPortOid10, kMtu10, true,
+                            kVlanOid2);
+
+    ValidateRouterInterfaceEntry(router_intf_entry);
+}
+
 TEST_F(RouterInterfaceManagerTest, CreateRouterInterfaceEntryExistsInManager)
 {
     P4RouterInterfaceEntry router_intf_entry(kRouterInterfaceId1, kPortName1, kMacAddress1);

orchagent/p4orch/tests/test_main.cpp

@@ -115,6 +115,7 @@ using ::testing::StrictMock;
 
 void CreatePort(const std::string port_name, const uint32_t speed, const uint32_t mtu, const sai_object_id_t port_oid,
                 Port::Type port_type = Port::PHY, const sai_port_oper_status_t oper_status = SAI_PORT_OPER_STATUS_DOWN,
+                const sai_object_id_t vlan_oid = 0,
                 const sai_object_id_t vrouter_id = gVirtualRouterId, const bool admin_state_up = true)
 {
     Port port(port_name, port_type);
@@ -131,6 +132,7 @@ void CreatePort(const std::string port_name, const uint32_t speed, const uint32_
     port.m_vr_id = vrouter_id;
     port.m_admin_state_up = admin_state_up;
     port.m_oper_status = oper_status;
+    if (port_type == Port::SUBPORT) port.m_vlan_info.vlan_oid = vlan_oid;
 
     gPortsOrch->setPort(port_name, port);
 }
@@ -155,6 +157,9 @@ void SetupPorts()
                /*mtu=*/9100, /*port_oid=*/0x5678, /*port_type*/ Port::MGMT);
     CreatePort(/*port_name=*/"Ethernet9", /*speed=*/50000,
                /*mtu=*/9100, /*port_oid=*/0x56789abcfff, Port::PHY, SAI_PORT_OPER_STATUS_UNKNOWN);
+    CreatePort(/*port_name=*/"Ethernet10", /*speed=*/50000,
+               /*mtu=*/9100, /*port_oid=*/0xabcfff, Port::SUBPORT, SAI_PORT_OPER_STATUS_DOWN, 
+               /*vlan_oid=*/0xffffff);
 }
 
 void AddVrf()