s/instance_group_record/local_instance_group

cjreynol · cjreynol · commit 332078a3aa45 · 2025-12-09T00:43:10.000Z
Fix filenames to match class name.

Bug: 467139097
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.cpp
@@ -41,8 +41,8 @@
 #include "cuttlefish/host/commands/cvd/cli/selector/selector.h"
 #include "cuttlefish/host/commands/cvd/cli/types.h"
 #include "cuttlefish/host/commands/cvd/cli/utils.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 #include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 #include "cuttlefish/host/libs/zip/zip_file.h"
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/create.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/create.cpp
@@ -50,8 +50,8 @@
 #include "cuttlefish/host/commands/cvd/cli/types.h"
 #include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_database_types.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 #include "cuttlefish/host/libs/metrics/metrics_orchestration.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/load_configs.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/load_configs.cpp
@@ -37,8 +37,8 @@
 #include "cuttlefish/host/commands/cvd/cli/types.h"
 #include "cuttlefish/host/commands/cvd/fetch/fetch_cvd.h"
 #include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 #include "cuttlefish/host/commands/cvd/utils/interrupt_listener.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/remove.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/remove.cpp
@@ -30,8 +30,8 @@
 #include "cuttlefish/host/commands/cvd/cli/selector/selector.h"
 #include "cuttlefish/host/commands/cvd/cli/types.h"
 #include "cuttlefish/host/commands/cvd/cli/utils.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 namespace {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/snapshot.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/snapshot.cpp
@@ -37,8 +37,8 @@
 #include "cuttlefish/host/commands/cvd/cli/selector/selector.h"
 #include "cuttlefish/host/commands/cvd/cli/types.h"
 #include "cuttlefish/host/commands/cvd/cli/utils.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp
@@ -55,8 +55,8 @@
 #include "cuttlefish/host/commands/cvd/fetch/substitute.h"
 #include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_database_types.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/instances/lock/instance_lock.h"
 #include "cuttlefish/host/commands/cvd/instances/operator_client.h"
 #include "cuttlefish/host/commands/cvd/instances/stop.h"
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_configs_parser.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_configs_parser.cpp
@@ -48,8 +48,8 @@
 #include "cuttlefish/host/commands/cvd/cli/parser/launch_cvd_parser.h"
 #include "cuttlefish/host/commands/cvd/cli/parser/load_config.pb.h"
 #include "cuttlefish/host/commands/cvd/cli/parser/selector_parser.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_configs_parser.h b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_configs_parser.h
@@ -22,8 +22,8 @@
 
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/cli/parser/load_config.pb.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/selector/selector.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/selector/selector.cpp
@@ -29,7 +29,7 @@
 
 #include "cuttlefish/host/commands/cvd/cli/interruptible_terminal.h"
 #include "cuttlefish/host/commands/cvd/cli/utils.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/selector/selector.h b/base/cvd/cuttlefish/host/commands/cvd/cli/selector/selector.h
@@ -20,9 +20,9 @@
 
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/cli/command_request.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 namespace selector {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel
@@ -47,18 +47,6 @@ cf_cc_library(
     ],
 )
 
-cf_cc_test(
-    name = "group_record_test",
-    srcs = ["group_record_test.cpp"],
-    deps = [
-        "//cuttlefish/common/libs/utils:result_matchers",
-        "//cuttlefish/host/commands/cvd/instances",
-        "//cuttlefish/host/commands/cvd/instances:cvd_persistent_data",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
-)
-
 cf_cc_library(
     name = "instance_database_helper",
     testonly = True,
@@ -93,18 +81,18 @@ cf_cc_library(
     srcs = [
         "instance_database.cpp",
         "instance_database_types.cpp",
-        "instance_group_record.cpp",
         "instance_manager.cpp",
         "local_instance.cpp",
+        "local_instance_group.cpp",
         "operator_client.cpp",
         "status_fetcher.cpp",
     ],
     hdrs = [
         "instance_database.h",
         "instance_database_types.h",
-        "instance_group_record.h",
         "instance_manager.h",
         "local_instance.h",
+        "local_instance_group.h",
         "operator_client.h",
         "status_fetcher.h",
     ],
@@ -144,6 +132,18 @@ cf_cc_library(
     ],
 )
 
+cf_cc_test(
+    name = "local_instance_group_test",
+    srcs = ["local_instance_group_test.cpp"],
+    deps = [
+        "//cuttlefish/common/libs/utils:result_matchers",
+        "//cuttlefish/host/commands/cvd/instances",
+        "//cuttlefish/host/commands/cvd/instances:cvd_persistent_data",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
 cf_cc_test(
     name = "local_instance_test",
     srcs = ["local_instance_test.cpp"],
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/instance_database.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/instance_database.cpp
@@ -32,8 +32,8 @@
 #include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
 #include "cuttlefish/host/commands/cvd/instances/device_name.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/instance_database.h b/base/cvd/cuttlefish/host/commands/cvd/instances/instance_database.h
@@ -25,7 +25,7 @@
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
 #include "cuttlefish/host/commands/cvd/instances/data_viewer.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/instance_database_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/instance_database_test.cpp
@@ -26,7 +26,7 @@
 #include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_database.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_database_helper.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 /*
  * SetUp creates a mock ANDROID_HOST_OUT directory where there is
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.cpp
@@ -34,8 +34,8 @@
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/cli/commands/host_tool_target.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/instances/lock/instance_lock.h"
 #include "cuttlefish/host/commands/cvd/instances/lock/lock_file.h"
 #include "cuttlefish/host/commands/cvd/instances/stop.h"
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.h b/base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.h
@@ -26,8 +26,8 @@
 
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_database.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/instances/lock/instance_lock.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_group.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_group.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 #include <algorithm>
 #include <functional>
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_group.h b/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_group.h
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_group_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_group_test.cpp
@@ -20,16 +20,16 @@
 
 #include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 namespace selector {
 
 static std::string GroupName() { return "yah_ong"; }
 
-class CvdInstanceGroupUnitTest : public testing::Test {
+class LocalInstanceGroupUnitTest : public testing::Test {
  protected:
-  CvdInstanceGroupUnitTest() {}
+  LocalInstanceGroupUnitTest() {}
   Result<LocalInstanceGroup> Get() {
     LocalInstanceGroup::Builder builder(GroupName());
     builder.AddInstance(1, "tv_instance");
@@ -40,15 +40,15 @@ class CvdInstanceGroupUnitTest : public testing::Test {
   }
 };
 
-TEST_F(CvdInstanceGroupUnitTest, AddInstancesAndListAll) {
+TEST_F(LocalInstanceGroupUnitTest, AddInstancesAndListAll) {
   auto group_res = Get();
   auto instances = group_res->Instances();
 
   cvd::InstanceGroup group;
   ASSERT_EQ(instances.size(), 4);
 }
 
-TEST_F(CvdInstanceGroupUnitTest, SearchById) {
+TEST_F(LocalInstanceGroupUnitTest, SearchById) {
   auto group_res = Get();
   if (!group_res.ok()) {
     /*
@@ -60,7 +60,7 @@ TEST_F(CvdInstanceGroupUnitTest, SearchById) {
      */
     GTEST_SKIP() << "Failed to add instances to the group.";
   }
-  // valid_ids were added in the CvdInstanceGroupSearchUnitTest_SearchById
+  // valid_ids were added in the LocalinstanceGroupUnitTest_SearchById
   // constructor.
   std::vector<unsigned> valid_ids{1, 2, 7};
   std::vector<unsigned> invalid_ids{20, 0, 5};
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_test.cpp
@@ -15,7 +15,7 @@
 
 #include <gtest/gtest.h>
 
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 namespace selector {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/operator_client.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/operator_client.cpp
@@ -31,7 +31,7 @@
 #include "cuttlefish/common/libs/utils/json.h"
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/common/libs/utils/users.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/operator_client.h b/base/cvd/cuttlefish/host/commands/cvd/instances/operator_client.h
@@ -21,7 +21,7 @@
 
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/result.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/metrics/metrics_orchestration.cc b/base/cvd/cuttlefish/host/libs/metrics/metrics_orchestration.cc
@@ -30,8 +30,8 @@
 #include "cuttlefish/common/libs/utils/host_info.h"
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/common/libs/utils/tee_logging.h"
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/metrics/is_enabled.h"
 #include "cuttlefish/host/commands/cvd/version/version.h"
 #include "cuttlefish/host/libs/metrics/event_type.h"
diff --git a/base/cvd/cuttlefish/host/libs/metrics/metrics_orchestration.h b/base/cvd/cuttlefish/host/libs/metrics/metrics_orchestration.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
+#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 
 namespace cuttlefish {
 
