Skip to content

Commit 6551f2b

Browse files
jagratactogashidm
andauthored
Amt acm ccm apiv2 mt simplification v2 (#827)
Co-authored-by: togashidm <denisio.togashi@intel.com>
1 parent b46691c commit 6551f2b

File tree

11 files changed

+1304
-1150
lines changed

11 files changed

+1304
-1150
lines changed

apiv2/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.5-dev
1+
2.9.5

apiv2/api/openapi/openapi.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15947,6 +15947,13 @@ components:
1594715947
$ref: '#/components/schemas/google.protobuf.Timestamp'
1594815948
title: Timestamps
1594915949
additionalProperties: false
15950+
AmtControlMode:
15951+
type: string
15952+
title: AmtControlMode
15953+
enum:
15954+
- AMT_CONTROL_MODE_UNSPECIFIED
15955+
- AMT_CONTROL_MODE_ACM
15956+
- AMT_CONTROL_MODE_CCM
1595015957
AmtSku:
1595115958
type: string
1595215959
title: AmtSku
@@ -16262,6 +16269,15 @@ components:
1626216269
title: user_lvm_size
1626316270
description: LVM size in GB.
1626416271
readOnly: true
16272+
amtControlMode:
16273+
title: amt_control_mode
16274+
description: (OPTIONAL) coming from user selection
16275+
$ref: '#/components/schemas/AmtControlMode'
16276+
amtDnsSuffix:
16277+
type: string
16278+
title: amt_dns_suffix
16279+
maxLength: 1024
16280+
description: (OPTIONAL) textual message that describes dns_suffix for ACM mode.
1626516281
siteId:
1626616282
type: string
1626716283
title: site_id

apiv2/api/proto/resources/compute/v1/compute.proto

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ enum AmtSku {
7171
AMT_SKU_ISM = 2;
7272
}
7373

74+
enum AmtControlMode {
75+
AMT_CONTROL_MODE_UNSPECIFIED = 0;
76+
AMT_CONTROL_MODE_ACM = 1;
77+
AMT_CONTROL_MODE_CCM = 2;
78+
}
79+
7480
// A Host resource.
7581
message HostResource {
7682
// Resource ID, generated on Create.
@@ -222,6 +228,11 @@ message HostResource {
222228
status.v1.StatusIndication amt_status_indicator = 95 [(google.api.field_behavior) = OUTPUT_ONLY]; // Indicates dynamicity of the amt_status. Set by DM and OM RM only.
223229
uint32 amt_status_timestamp = 96 [(google.api.field_behavior) = OUTPUT_ONLY]; // UTC timestamp when amt_status was last changed. Set by DM and OM RM only.
224230
uint32 user_lvm_size = 97 [(google.api.field_behavior) = OUTPUT_ONLY]; // LVM size in GB.
231+
AmtControlMode amt_control_mode = 98 [(google.api.field_behavior) = OPTIONAL]; // coming from user selection
232+
string amt_dns_suffix = 99 [
233+
(google.api.field_behavior) = OPTIONAL,
234+
(buf.validate.field).string = {max_len: 1024}
235+
]; // textual message that describes dns_suffix for ACM mode.
225236

226237
// The site where the host is located.
227238
string site_id = 5001 [

apiv2/docs/proto.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
- [WorkloadMember](#resources-compute-v1-WorkloadMember)
5454
- [WorkloadResource](#resources-compute-v1-WorkloadResource)
5555

56+
- [AmtControlMode](#resources-compute-v1-AmtControlMode)
5657
- [AmtSku](#resources-compute-v1-AmtSku)
5758
- [AmtState](#resources-compute-v1-AmtState)
5859
- [BaremetalControllerKind](#resources-compute-v1-BaremetalControllerKind)
@@ -808,6 +809,8 @@ A Host resource.
808809
| amt_status_indicator | [resources.status.v1.StatusIndication](#resources-status-v1-StatusIndication) | | Indicates dynamicity of the amt_status. Set by DM and OM RM only. |
809810
| amt_status_timestamp | [uint32](#uint32) | | UTC timestamp when amt_status was last changed. Set by DM and OM RM only. |
810811
| user_lvm_size | [uint32](#uint32) | | LVM size in GB. |
812+
| amt_control_mode | [AmtControlMode](#resources-compute-v1-AmtControlMode) | | coming from user selection |
813+
| amt_dns_suffix | [string](#string) | | textual message that describes dns_suffix for ACM mode. |
811814
| site_id | [string](#string) | | The site where the host is located. |
812815
| metadata | [resources.common.v1.MetadataItem](#resources-common-v1-MetadataItem) | repeated | The metadata associated with the host, represented by a list of key:value pairs. |
813816
| inherited_metadata | [resources.common.v1.MetadataItem](#resources-common-v1-MetadataItem) | repeated | The metadata inherited by the host, represented by a list of key:value pairs, rendered by location and logical structures. |
@@ -1072,6 +1075,19 @@ A generic way to group compute resources to obtain a workload.
10721075

10731076

10741077

1078+
<a name="resources-compute-v1-AmtControlMode"></a>
1079+
1080+
### AmtControlMode
1081+
1082+
1083+
| Name | Number | Description |
1084+
| ---- | ------ | ----------- |
1085+
| AMT_CONTROL_MODE_UNSPECIFIED | 0 | |
1086+
| AMT_CONTROL_MODE_ACM | 1 | |
1087+
| AMT_CONTROL_MODE_CCM | 2 | |
1088+
1089+
1090+
10751091
<a name="resources-compute-v1-AmtSku"></a>
10761092

10771093
### AmtSku

apiv2/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ require (
1616
github.com/labstack/echo-contrib v0.17.4
1717
github.com/labstack/echo/v4 v4.13.4
1818
github.com/oapi-codegen/runtime v1.1.1
19-
github.com/open-edge-platform/infra-core/inventory/v2 v2.34.0
20-
github.com/open-edge-platform/orch-library/go v0.6.4-0.20260211092341-cfad67ad247d
19+
github.com/open-edge-platform/infra-core/inventory/v2 v2.34.2
20+
github.com/open-edge-platform/orch-library/go v0.6.4-0.20260126110346-c97eed1b3071
2121
github.com/prometheus/client_golang v1.23.2
2222
github.com/stretchr/testify v1.11.1
2323
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0

apiv2/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,8 +1062,10 @@ github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletI
10621062
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
10631063
github.com/open-edge-platform/infra-core/inventory/v2 v2.34.0 h1:gIUF9tot7mFyTmjKysNp9+UuoS82+KQypCyZY6by498=
10641064
github.com/open-edge-platform/infra-core/inventory/v2 v2.34.0/go.mod h1:NzKTZ1cCdSvixIvsA4Ig3zzsryIHQJHnF/bGQ1+JBbc=
1065-
github.com/open-edge-platform/orch-library/go v0.6.4-0.20260211092341-cfad67ad247d h1:xRow90Mk5U2h+R60TTL8lPXIFbdQWSnHyg09vh8NEPo=
1066-
github.com/open-edge-platform/orch-library/go v0.6.4-0.20260211092341-cfad67ad247d/go.mod h1:mYhs/KbcXPQWM+2cHZXyzeIIzM7xKvnNgsnHlFkXH0g=
1065+
github.com/open-edge-platform/infra-core/inventory/v2 v2.34.2 h1:7wPJ7RhM4K484HNxhz6Mjn/LuvHciDiey0cAR/Zmh6g=
1066+
github.com/open-edge-platform/infra-core/inventory/v2 v2.34.2/go.mod h1:NzKTZ1cCdSvixIvsA4Ig3zzsryIHQJHnF/bGQ1+JBbc=
1067+
github.com/open-edge-platform/orch-library/go v0.6.4-0.20260126110346-c97eed1b3071 h1:2guD75wyXGb++NJwPZRSByUfO7njLktCkALZHzQH9rk=
1068+
github.com/open-edge-platform/orch-library/go v0.6.4-0.20260126110346-c97eed1b3071/go.mod h1:mYhs/KbcXPQWM+2cHZXyzeIIzM7xKvnNgsnHlFkXH0g=
10671069
github.com/open-edge-platform/orch-library/go/dazl v0.5.4 h1:Rx/bSAZiLjEEBjUiJEzBvT0fQv5huT5FQ2Ke3IMUhiE=
10681070
github.com/open-edge-platform/orch-library/go/dazl v0.5.4/go.mod h1:UiO3TOEqEuRT81OtgPsqR9LpB1887i5nk2TelhJksMY=
10691071
github.com/open-policy-agent/opa v1.10.1 h1:haIvxZSPky8HLjRrvQwWAjCPLg8JDFSZMbbG4yyUHgY=

0 commit comments

Comments
 (0)