Add resource and data source for MACsec Policy under Fabric Policy Template. (DCNE-393) #391

gmicol · 2025-10-30T17:19:09Z

fixes #356

shrsr

LGTM

akinross · 2025-10-31T08:21:59Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+* `sak_expire_time` - (Optional) The expiry time for the Security Association Key (SAK) for the MACsec Policy. Allowed value is 0 or valid range: 60-2592000. Defaults to 0 when unset during creation.
+* `confidentiality_offset` - (Optional) The confidentiality offset for the MACsec Policy. This paramater is only configurable for `access` type. Allowed values are `offset0`, `offset30` or `offset50`. Defaults to `offset0` when unset during creation.
+* `key_server_priority` - (Optional) The key server priority for the MACsec Policy. This paramater is only configurable for `access` type. Valid range: 0-255. Defaults to 16 when unset during creation.
+* `macsec_key` - (Optional) The list of MACsec Keys.


should this be macsec_keys considering it is a list?

you're right I think it should be

akinross · 2025-10-31T08:22:21Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+    psk                  = "AA111111111111111111111111111111111111111111111111111111111111aa"
+    start_time           = "now"
+    end_time             = "2027-09-23 00:00:00"
+	}


indentation issue

I double checked, there is no indentation issue. when viewing the full file, the indentation is correct.

see image the macsec_keys attributes before closing bracket are indented wrong, there seems to be a tab before the closing bracket of macsec_keys

Oh sorry, my bad I did not see the bracket, will fix it

website/docs/d/fabric_policies_macsec_policy.html.markdown

akinross · 2025-10-31T08:24:45Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+An existing MSO MACsec Policy can be [imported][docs-import] into this resource via its ID/path, via the following command: [docs-import]: <https://www.terraform.io/docs/import/index.html>
+
+```bash
+terraform import mso_fabric_policies_macsec_policy.macsec_policy templateId/{template_id}/VlanPool/{name}


is this VlanPool/{name} correct?

Mistake, will correct that

akinross · 2025-11-03T12:56:18Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+    psk                  = "AA111111111111111111111111111111111111111111111111111111111111aa"
+    start_time           = "now"
+    end_time             = "2027-09-23 00:00:00"
+	}


see image the macsec_keys attributes before closing bracket are indented wrong, there seems to be a tab before the closing bracket of macsec_keys

shrsr

LGTM

anvitha-jain · 2025-11-03T23:27:32Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+* `security_policy` - (Optional) The security policy to allow traffic on the link for the MACsec Policy. Allowed values are `shouldSecure` or `mustSecure`. Defaults to `shouldSecure` when unset during creation.
+* `sak_expire_time` - (Optional) The expiry time for the Security Association Key (SAK) for the MACsec Policy. Allowed value is 0 or valid range: 60-2592000. Defaults to 0 when unset during creation.
+* `confidentiality_offset` - (Optional) The confidentiality offset for the MACsec Policy. This paramater is only configurable for `access` type. Allowed values are `offset0`, `offset30` or `offset50`. Defaults to `offset0` when unset during creation.
+* `key_server_priority` - (Optional) The key server priority for the MACsec Policy. This paramater is only configurable for `access` type. Valid range: 0-255. Defaults to 16 when unset during creation.


paramater -> parameter

anvitha-jain · 2025-11-03T23:28:08Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+* `window_size` - (Optional) The window size of the MACsec Policy. It defines the maximum number of frames that can be received out of order before a replay attack is detected. Valid range: 0-4294967295. Defaults to 0 for `fabric` type or to 64 for `access` type when unset during creation.
+* `security_policy` - (Optional) The security policy to allow traffic on the link for the MACsec Policy. Allowed values are `shouldSecure` or `mustSecure`. Defaults to `shouldSecure` when unset during creation.
+* `sak_expire_time` - (Optional) The expiry time for the Security Association Key (SAK) for the MACsec Policy. Allowed value is 0 or valid range: 60-2592000. Defaults to 0 when unset during creation.
+* `confidentiality_offset` - (Optional) The confidentiality offset for the MACsec Policy. This paramater is only configurable for `access` type. Allowed values are `offset0`, `offset30` or `offset50`. Defaults to `offset0` when unset during creation.


paramater -> parameter

shrsr

LGTM

anvitha-jain

LGTM

samiib · 2025-11-05T00:12:46Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+* `description` - (Optional) The description of the MACsec Policy.
+* `admin_state` - (Optional) The administrative state of the MACsec Policy. Allowed values are `enabled` or `disabled`. Defaults to `enabled` when unset during creation.
+* `interface_type` - (Optional) The type of the interfaces the MACsec Policy will be applied to. Allowed values are `fabric` or `access`.
+* `cipher_suite` - (Optional) The cipher suite of the MACsec Policy to be used for encryption. Allowed values are `128GcmAes`, `128GcmAesXpn`, `256GcmAes` or `256GcmAesXpn`. Defaults to `enabled` when unset during creation.


Is the default of enabled correct here? It wasn't listed in the allowed values.

that's a mistake, will change it.

samiib · 2025-11-05T00:13:54Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+* `confidentiality_offset` - (Optional) The confidentiality offset for the MACsec Policy. This parameter is only configurable for `access` type. Allowed values are `offset0`, `offset30` or `offset50`. Defaults to `offset0` when unset during creation.
+* `key_server_priority` - (Optional) The key server priority for the MACsec Policy. This parameter is only configurable for `access` type. Valid range: 0-255. Defaults to 16 when unset during creation.
+* `macsec_keys` - (Optional) The list of MACsec Keys.
+  * `macsec_keys.key_name` - (Required) The name of the MACsec Key. Key Name has to be hexadecimal characters [0-9a-fA-F].


Suggested change

* `macsec_keys.key_name` - (Required) The name of the MACsec Key. Key Name has to be hexadecimal characters [0-9a-fA-F].

* `macsec_keys.key_name` - (Required) The name of the MACsec Key. Key Name should only contain hexadecimal characters [0-9a-fA-F].

samiib · 2025-11-05T00:14:50Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+* `key_server_priority` - (Optional) The key server priority for the MACsec Policy. This parameter is only configurable for `access` type. Valid range: 0-255. Defaults to 16 when unset during creation.
+* `macsec_keys` - (Optional) The list of MACsec Keys.
+  * `macsec_keys.key_name` - (Required) The name of the MACsec Key. Key Name has to be hexadecimal characters [0-9a-fA-F].
+  * `macsec_keys.psk` - (Required) The Pre-Shared Key (PSK) for the MACsec Key. PSK has to be hexadecimal characters [0-9a-fA-F]. PSK has to be 64 characters long if cipher suite is `256GcmAes` or `256GcmAesXpn`. PSK has to be 32 characters long if cipher suite is `128GcmAes` or `128GcmAesXpn`.


Suggested change

* `macsec_keys.psk` - (Required) The Pre-Shared Key (PSK) for the MACsec Key. PSK has to be hexadecimal characters [0-9a-fA-F]. PSK has to be 64 characters long if cipher suite is `256GcmAes` or `256GcmAesXpn`. PSK has to be 32 characters long if cipher suite is `128GcmAes` or `128GcmAesXpn`.

* `macsec_keys.psk` - (Required) The Pre-Shared Key (PSK) for the MACsec Key. PSK should only contain hexadecimal characters [0-9a-fA-F]. PSK should be 64 characters long if cipher suite is `256GcmAes` or `256GcmAesXpn`. PSK should be 32 characters long if cipher suite is `128GcmAes` or `128GcmAesXpn`.

samiib · 2025-11-05T00:15:17Z

website/docs/r/fabric_policies_macsec_policy.html.markdown

+  * `macsec_keys.key_name` - (Required) The name of the MACsec Key. Key Name has to be hexadecimal characters [0-9a-fA-F].
+  * `macsec_keys.psk` - (Required) The Pre-Shared Key (PSK) for the MACsec Key. PSK has to be hexadecimal characters [0-9a-fA-F]. PSK has to be 64 characters long if cipher suite is `256GcmAes` or `256GcmAesXpn`. PSK has to be 32 characters long if cipher suite is `128GcmAes` or `128GcmAesXpn`.
+  * `macsec_keys.start_time` - (Optional) The start time for the MACsec Key. Allowed values are of the following format `YYYY-MM-DD HH:MM:SS` or `now`. The start time for each Key should be unique.
+  * `macsec_keys.end_time` - (Optional) TThe end time for the MACsec Key. Allowed values are of the following format `YYYY-MM-DD HH:MM:SS` or `infinite`.


Suggested change

* `macsec_keys.end_time` - (Optional) TThe end time for the MACsec Key. Allowed values are of the following format `YYYY-MM-DD HH:MM:SS` or `infinite`.

* `macsec_keys.end_time` - (Optional) The end time for the MACsec Key. Allowed values are of the following format `YYYY-MM-DD HH:MM:SS` or `infinite`.

…abric Policy Template.

…n issue for resource and data source.

…e Documentation.

akinross

LGTM

shrsr

LGTM

anvitha-jain

LGTM

samiib

LGTM

lhercot

LGTM

gmicol self-assigned this Oct 30, 2025

gmicol requested review from akinross, anvitha-jain, lhercot, sajagana, samiib and shrsr as code owners October 30, 2025 17:19

shrsr previously approved these changes Oct 30, 2025

View reviewed changes

akinross requested changes Oct 31, 2025

View reviewed changes

gmicol dismissed shrsr’s stale review via 82971dc October 31, 2025 14:37

gmicol force-pushed the mso_macsec branch from 3980760 to 82971dc Compare October 31, 2025 14:37

gmicol requested review from akinross and shrsr October 31, 2025 14:37

akinross requested changes Nov 3, 2025

View reviewed changes

gmicol requested a review from akinross November 3, 2025 16:30

shrsr previously approved these changes Nov 3, 2025

View reviewed changes

anvitha-jain requested changes Nov 3, 2025

View reviewed changes

gmicol dismissed shrsr’s stale review via 0e4746c November 4, 2025 18:51

gmicol requested review from anvitha-jain and shrsr November 4, 2025 18:51

shrsr previously approved these changes Nov 4, 2025

View reviewed changes

anvitha-jain previously approved these changes Nov 4, 2025

View reviewed changes

samiib requested changes Nov 5, 2025

View reviewed changes

gmicol added 5 commits November 5, 2025 13:50

[minor_change] Add resource and data source for MACsec Policy under F…

e9c640c

…abric Policy Template.

[ignore] Change macsec_key attribute to macsec_keys. Fix Documentatio…

eb3c5b8

…n issue for resource and data source.

[ignore] Fix identation issues.

44f0f61

[ignore] Modify small typo mistake in MACsec resource documentation.

098edc4

[ignore] Fix attributes description in MACsec resource and data sourc…

d5d8c60

…e Documentation.

gmicol dismissed stale reviews from anvitha-jain and shrsr via d5d8c60 November 5, 2025 18:50

gmicol force-pushed the mso_macsec branch from 0e4746c to d5d8c60 Compare November 5, 2025 18:50

gmicol requested review from anvitha-jain, samiib and shrsr November 5, 2025 18:51

akinross approved these changes Nov 6, 2025

View reviewed changes

shrsr approved these changes Nov 6, 2025

View reviewed changes

anvitha-jain approved these changes Nov 6, 2025

View reviewed changes

samiib approved these changes Nov 6, 2025

View reviewed changes

lhercot approved these changes Nov 7, 2025

View reviewed changes

lhercot merged commit 9d28157 into CiscoDevNet:master Nov 7, 2025
11 checks passed

	* `macsec_keys.key_name` - (Required) The name of the MACsec Key. Key Name has to be hexadecimal characters [0-9a-fA-F].
	* `macsec_keys.key_name` - (Required) The name of the MACsec Key. Key Name should only contain hexadecimal characters [0-9a-fA-F].

	* `macsec_keys.psk` - (Required) The Pre-Shared Key (PSK) for the MACsec Key. PSK has to be hexadecimal characters [0-9a-fA-F]. PSK has to be 64 characters long if cipher suite is `256GcmAes` or `256GcmAesXpn`. PSK has to be 32 characters long if cipher suite is `128GcmAes` or `128GcmAesXpn`.
	* `macsec_keys.psk` - (Required) The Pre-Shared Key (PSK) for the MACsec Key. PSK should only contain hexadecimal characters [0-9a-fA-F]. PSK should be 64 characters long if cipher suite is `256GcmAes` or `256GcmAesXpn`. PSK should be 32 characters long if cipher suite is `128GcmAes` or `128GcmAesXpn`.

	* `macsec_keys.end_time` - (Optional) TThe end time for the MACsec Key. Allowed values are of the following format `YYYY-MM-DD HH:MM:SS` or `infinite`.
	* `macsec_keys.end_time` - (Optional) The end time for the MACsec Key. Allowed values are of the following format `YYYY-MM-DD HH:MM:SS` or `infinite`.

Add resource and data source for MACsec Policy under Fabric Policy Template. (DCNE-393) #391

Add resource and data source for MACsec Policy under Fabric Policy Template. (DCNE-393) #391

Uh oh!

Conversation

gmicol commented Oct 30, 2025

Uh oh!

shrsr left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shrsr left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shrsr left a comment

Choose a reason for hiding this comment

Uh oh!

anvitha-jain left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gmicol Nov 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akinross left a comment

Choose a reason for hiding this comment

Uh oh!

shrsr left a comment

Choose a reason for hiding this comment

Uh oh!

anvitha-jain left a comment

Choose a reason for hiding this comment

Uh oh!

samiib left a comment

Choose a reason for hiding this comment

Uh oh!

lhercot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

gmicol Nov 5, 2025 •

edited

Loading