Internal change

PiperOrigin-RevId: 876518519

Author: DeviceInfra

src/devtools/mobileharness/fe/v6/service/proto/common/BUILD

@@ -0,0 +1,32 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_visibility = ["//visibility:public"],
+)
+
+proto_library(
+    name = "common_resources_proto",
+    srcs = ["common_resources.proto"],
+)
+
+java_proto_library(
+    name = "common_resources_java_proto",
+    deps = [":common_resources_proto"],
+)

src/devtools/mobileharness/fe/v6/service/proto/common/common_resources.proto

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto3";
+
+package devtools.mobileharness.fe.v6.service.proto.common;
+
+option java_package = "com.google.devtools.mobileharness.fe.v6.service.proto.common";
+option java_multiple_files = true;
+option java_outer_classname = "CommonResourcesProto";
+
+// Information about user and group permissions.
+message PermissionInfo {
+  // List of users/groups who own the resource.
+  repeated string owners = 1;
+  // List of users/groups who can execute actions on the resource.
+  repeated string executors = 2;
+}
+
+// Represents one dimension of a resource (e.g., device, host).
+message DeviceDimension {
+  string name = 1;
+  string value = 2;
+}

src/devtools/mobileharness/fe/v6/service/proto/config/BUILD

@@ -28,6 +28,9 @@ package(
 proto_library(
     name = "config_resources_proto",
     srcs = ["config_resources.proto"],
+    deps = [
+        "//src/devtools/mobileharness/fe/v6/service/proto/common:common_resources_proto",
+    ],
 )
 
 java_proto_library(

src/devtools/mobileharness/fe/v6/service/proto/config/config_resources.proto

@@ -18,25 +18,12 @@ syntax = "proto3";
 
 package devtools.mobileharness.fe.v6.service.proto.config;
 
+import "src/devtools/mobileharness/fe/v6/service/proto/common/common_resources.proto";
+
 option java_package = "com.google.devtools.mobileharness.fe.v6.service.proto.config";
 option java_multiple_files = true;
 option java_outer_classname = "ConfigResourcesProto";
 
-// Represents a single dimension name-value pair.
-message DeviceDimension {
-  string name = 1;
-  string value = 2;
-}
-
-// Defines who can control and use a device.
-message PermissionInfo {
-  // List of users or groups who have full control over the device,
-  // including changing its configuration.
-  repeated string owners = 1;
-  // List of users or groups who are allowed to execute tests on the device.
-  repeated string executors = 2;
-}
-
 // Configuration for the device's default Wi-Fi network.
 message WifiConfig {
   // Type of Wi-Fi configuration.
@@ -74,10 +61,13 @@ message StabilitySettings {
 // in the UI.
 message DeviceConfig {
   message Dimensions {
-    repeated DeviceDimension supported = 1;
-    repeated DeviceDimension required = 2;
+    repeated devtools.mobileharness.fe.v6.service.proto.common.DeviceDimension
+        supported = 1;
+    repeated devtools.mobileharness.fe.v6.service.proto.common.DeviceDimension
+        required = 2;
   }
-  PermissionInfo permissions = 1;
+  devtools.mobileharness.fe.v6.service.proto.common.PermissionInfo permissions =
+      1;
   WifiConfig wifi = 2;
   Dimensions dimensions = 3;
   StabilitySettings settings = 4;
@@ -113,20 +103,12 @@ enum DeviceConfigSection {
   ALL = 5;
 }
 
-// Defines a principal (user or group) allowed to SSH as a specific login user.
-message SshPrincipal {
-  // The username on the host machine (e.g., 'root', 'mobileharness')
-  string login_user = 1;
-  // List of users or MDB groups allowed to assume the loginUser role
-  repeated string principals = 2;
-}
-
 // Permissions for the host.
 message HostPermissions {
   // Users/groups who can edit this host config.
   repeated string host_admins = 1;
-  repeated SshPrincipal ssh_access =
-      2;  // Defines SSH access rules. Will be [] if no rules are set.
+
+  reserved 2;
 }
 
 // Device configuration mode for the host.

src/devtools/mobileharness/fe/v6/service/proto/device/BUILD

@@ -29,6 +29,7 @@ proto_library(
     name = "device_resources_proto",
     srcs = ["device_resources.proto"],
     deps = [
+        "//src/devtools/mobileharness/fe/v6/service/proto/common:common_resources_proto",
         "@protobuf//:timestamp_proto",
     ],
 )

src/devtools/mobileharness/fe/v6/service/proto/device/device_resources.proto

@@ -19,6 +19,7 @@ syntax = "proto3";
 package devtools.mobileharness.fe.v6.service.proto.device;
 
 import "google/protobuf/timestamp.proto";
+import "src/devtools/mobileharness/fe/v6/service/proto/common/common_resources.proto";
 
 option java_package = "com.google.devtools.mobileharness.fe.v6.service.proto.device";
 option java_multiple_files = true;
@@ -41,7 +42,8 @@ message DeviceOverview {
   BasicDeviceInfo basic_info = 4;
 
   // Permissions defining who can own and execute tests on the device.
-  PermissionInfo permissions = 5;
+  devtools.mobileharness.fe.v6.service.proto.common.PermissionInfo permissions =
+      5;
 
   // Lists of supported drivers and decorators for the device.
   CapabilitiesInfo capabilities = 6;
@@ -175,14 +177,6 @@ message BasicDeviceInfo {
   string build = 8;
 }
 
-// Information about user and group permissions for the device.
-message PermissionInfo {
-  // List of users/groups who own the device.
-  repeated string owners = 1;
-  // List of users/groups who can execute tests on the device.
-  repeated string executors = 2;
-}
-
 // Lists of supported test drivers and decorators.
 message CapabilitiesInfo {
   // Test drivers compatible with this device.
@@ -191,15 +185,10 @@ message CapabilitiesInfo {
   repeated string supported_decorators = 2;
 }
 
-// Represents one dimension of the device.
-message DeviceDimension {
-  string name = 1;
-  string value = 2;
-}
-
 // Represents a group of dimensions from a single source.
 message DimensionSourceGroup {
-  repeated DeviceDimension dimensions = 1;
+  repeated devtools.mobileharness.fe.v6.service.proto.common.DeviceDimension
+      dimensions = 1;
 }
 
 // Device dimensions, categorized into 'supported' and 'required'.
@@ -214,7 +203,8 @@ message Dimensions {
 message SubDeviceInfo {
   string id = 1;
   repeated DeviceType types = 2;
-  repeated DeviceDimension dimensions = 3;
+  repeated devtools.mobileharness.fe.v6.service.proto.common.DeviceDimension
+      dimensions = 3;
 
   // Model of the sub-device.
   string model = 4;

src/java/com/google/devtools/mobileharness/fe/v6/service/config/util/BUILD

@@ -0,0 +1,35 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+load("@rules_java//java:java_library.bzl", "java_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_visibility = ["//src/devtools/mobileharness/fe/v6:visibility"],
+)
+
+java_library(
+    name = "device_config_converter",
+    srcs = ["DeviceConfigConverter.java"],
+    deps = [
+        "//src/devtools/mobileharness/api/deviceconfig/proto:basic_java_proto",
+        "//src/devtools/mobileharness/api/deviceconfig/proto:lab_java_proto",
+        "//src/devtools/mobileharness/api/model/proto:device_java_proto",
+        "//src/devtools/mobileharness/fe/v6/service/proto/common:common_resources_java_proto",
+        "//src/devtools/mobileharness/fe/v6/service/proto/config:config_resources_java_proto",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
+    ],
+)