ACM-CCM changes for inventory (#798)

Merging Inventory changes

Author: jagratac

inventory/VERSION

@@ -1 +1 @@
-2.34.1
+2.34.2

inventory/api/compute/v1/compute.proto

@@ -68,6 +68,12 @@ enum AmtSku {
   AMT_SKU_ISM = 2;
 }
 
+enum AmtControlMode {
+  AMT_CONTROL_MODE_UNSPECIFIED = 0;
+  AMT_CONTROL_MODE_ACM = 1;
+  AMT_CONTROL_MODE_CCM = 2;
+}
+
 message HostResource {
   option (ent.schema) = {gen: true};
   option (infrainv.schemaExtension) = {
@@ -227,6 +233,12 @@ message HostResource {
   status.v1.StatusIndication amt_status_indicator = 95 [(ent.field) = {optional: true}]; // Indicates dynamicity of the amt_status. Set by DM and OM RM only.
   uint64 amt_status_timestamp = 96 [(ent.field) = {optional: true}]; // UTC timestamp when amt_status was last changed. Set by DM and OM RM only.
   uint32 user_lvm_size = 97 [(ent.field) = {optional: true}]; // LVM size in GB.
+  AmtControlMode amt_control_mode = 98 [(ent.field) = {optional: true}]; // coming from user selection
+  string amt_dns_suffix = 99 [
+    (ent.field) = {optional: true},
+    (buf.validate.field).string = {max_bytes: 1024},
+    (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
+  ]; // textual message that describes dns_suffix for ACM mode.
 
   string tenant_id = 100 [
     (ent.field) = {

inventory/docs/api/inventory.md

@@ -42,6 +42,7 @@
     - [WorkloadMember](#compute-v1-WorkloadMember)
     - [WorkloadResource](#compute-v1-WorkloadResource)
 
+    - [AmtControlMode](#compute-v1-AmtControlMode)
     - [AmtSku](#compute-v1-AmtSku)
     - [AmtState](#compute-v1-AmtState)
     - [BaremetalControllerKind](#compute-v1-BaremetalControllerKind)
@@ -585,6 +586,8 @@ textual message that describes the AMT status of Host. Set by DM RM only. |
 | amt_status_indicator | [status.v1.StatusIndication](#status-v1-StatusIndication) |  | Indicates dynamicity of the amt_status. Set by DM and OM RM only. |
 | amt_status_timestamp | [uint64](#uint64) |  | UTC timestamp when amt_status was last changed. Set by DM and OM RM only. |
 | user_lvm_size | [uint32](#uint32) |  | LVM size in GB. |
+| amt_control_mode | [AmtControlMode](#compute-v1-AmtControlMode) |  | coming from user selection |
+| amt_dns_suffix | [string](#string) |  | textual message that describes dns_suffix for ACM mode. |
 | tenant_id | [string](#string) |  | Tenant Identifier |
 | created_at | [string](#string) |  | Creation timestamp |
 | updated_at | [string](#string) |  | Update timestamp |
@@ -880,6 +883,19 @@ Represents a generic way to group compute resources (e.g., cluster, DHCP...).
 
 
 
+<a name="compute-v1-AmtControlMode"></a>
+
+### AmtControlMode
+
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| AMT_CONTROL_MODE_UNSPECIFIED | 0 |  |
+| AMT_CONTROL_MODE_ACM | 1 |  |
+| AMT_CONTROL_MODE_CCM | 2 |  |
+
+
+
 <a name="compute-v1-AmtSku"></a>
 
 ### AmtSku