Fix coding error in ReadMeterEntry() (#318)

- The ReadSingleIndirectMeterEntryTest test case failed because
  ReadMeterEntry() was calling FindResourceTypeByID() with the
  table_id instead of meter_entry.meter_id(). Corrected this,
  and the test case passes.

- Reenabled the ReadSingleIndirectMeterEntryTest test case.

Signed-off-by: Derek Foster <derek.foster@intel.com>

Author: ffoulkes

stratum/hal/lib/tdi/tdi_table_manager.cc

@@ -977,8 +977,8 @@ ::util::Status TdiTableManager::ReadMeterEntry(
   ASSIGN_OR_RETURN(uint32 table_id,
                    tdi_sde_interface_->GetTdiRtId(meter_entry.meter_id()));
 
-  ASSIGN_OR_RETURN(auto resource_type,
-                   p4_info_manager_->FindResourceTypeByID(table_id));
+  ASSIGN_OR_RETURN(auto resource_type, p4_info_manager_->FindResourceTypeByID(
+                                           meter_entry.meter_id()));
 
   if (resource_type == "Meter") {
     {

stratum/hal/lib/tdi/tdi_table_manager_test.cc

@@ -357,8 +357,7 @@ TEST_F(TdiTableManagerTest, DISABLED_RejectMeterEntryInsertDelete) {
   EXPECT_EQ(ERR_INVALID_PARAM, ret.error_code());
 }
 
-// See https://github.com/ipdk-io/stratum-dev/issues/315.
-TEST_F(TdiTableManagerTest, DISABLED_ReadSingleIndirectMeterEntryTest) {
+TEST_F(TdiTableManagerTest, ReadSingleIndirectMeterEntryTest) {
   ASSERT_OK(PushTestConfig());
   auto session_mock = std::make_shared<SessionMock>();
   constexpr int kP4MeterId = 55555;