Skip to content

Commit 2886c3b

Browse files
idanielstevenidanielsteven
committed
rolling back changes to param names to reduce breaking changes
1 parent 25b2763 commit 2886c3b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+486
-515
lines changed

‎src/managednetworkfabric/HISTORY.rst‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,9 @@ Release History
44
===============
55
9.0.0
66
++++++
7-
* This version requires a minimum of 2.75.0 Azure core CLI. See release notes for more details: https://github.com/MicrosoftDocs/azure-docs-cli/blob/main/docs-ref-conceptual/release-notes-azure-cli.md
87
* Adds `bootstrapdevice`` and `bootstrapinterface`` resources and commands.
9-
* For consistency the following command parameter-names have been updated
10-
* - `--nni-name network-to-network-interconnect-name` parameter on `nni update-bfd-administrative-state` has been changed to `--resource-name`.
11-
* - `--network-fabric-name` parameter on `nni update-bfd-administrative-state` has been changed to `--fabric --fabric-name`.
12-
* - `--network-to-network-interconnect-name` parameter on `nni update-npb-static-route-bfd-administrative-state` has been changed to `--resource-name`.
13-
* - `--network-fabric-name` parameter on `nni update-npb-static-route-bfd-administrative-state` has been changed to `--fabric", "--fabric-name`.
14-
* - `--network-fabric-name` parameter on `fabric arm-configuration-diff` has been changed to `--resource-name`.
15-
* - `--network-fabric-name` parameter on `fabric commit-batch-status` has been changed to `--resource-name`.
16-
* - `--network-fabric-name` parameter on `fabric view-device-configuration` has been changed to `--resource-name`.
17-
* - `--network-fabric-name` parameter on `fabric discard-commit-batch` has been changed to `--resource-name`.
18-
* - `--network-fabric-name --name -n`` parameters on `fabric identity` sub-commands `assign`, `remove`, `show`, `wait`` have been changed to `--resource-name`.
8+
* For consistency the `--network-fabric-name`` parameter on `nni updatebfdadminstrativestate` has been changed to `--fabric --fabric-name`.
9+
* For consistency the `--network-fabric-name --name -n`` parameter on `fabric identity` sub-commands `assign`, `remove`, `show`, `wait`` have been changed to `--resource-name`.
1910

2011
8.0.0b7
2112
++++++

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/acl/_update.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
8484
enum={"File": "File", "Inline": "Inline"},
8585
)
8686
_args_schema.control_plane_acl_configuration = AAZListArg(
87-
options=["--cp-acl-config", "--control-plane-acl-configuration"],
87+
options=["--control-plane-acl-configuration"],
8888
arg_group="Properties",
8989
help="Access Control List (ACL) configurations.",
9090
)

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/bootstrapdevice/_create.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ def _build_arguments_schema(cls, *args, **kwargs):
5757
# define Arg Group "Identity"
5858

5959
_args_schema = cls._args_schema
60-
_args_schema.system_assigned = AAZStrArg(
61-
options=["--system-assigned"],
60+
_args_schema.mi_system_assigned = AAZStrArg(
61+
options=["--system-assigned", "--mi-system-assigned"],
6262
arg_group="Identity",
6363
help="Set the system managed identity.",
6464
blank="True",
6565
)
66-
_args_schema.user_assigned = AAZListArg(
67-
options=["--user-assigned"],
66+
_args_schema.mi_user_assigned = AAZListArg(
67+
options=["--user-assigned", "--mi-user-assigned"],
6868
arg_group="Identity",
6969
help="Set the user managed identities.",
7070
blank=[],
7171
)
7272

73-
user_assigned = cls._args_schema.user_assigned
74-
user_assigned.Element = AAZStrArg()
73+
mi_user_assigned = cls._args_schema.mi_user_assigned
74+
mi_user_assigned.Element = AAZStrArg()
7575

7676
# define Arg Group "Properties"
7777

@@ -237,8 +237,8 @@ def content(self):
237237

238238
identity = _builder.get(".identity")
239239
if identity is not None:
240-
identity.set_prop("userAssigned", AAZListType, ".user_assigned", typ_kwargs={"flags": {"action": "create"}})
241-
identity.set_prop("systemAssigned", AAZStrType, ".system_assigned", typ_kwargs={"flags": {"action": "create"}})
240+
identity.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "create"}})
241+
identity.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "create"}})
242242

243243
user_assigned = _builder.get(".identity.userAssigned")
244244
if user_assigned is not None:

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/bootstrapdevice/_update.py‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,23 @@ def _build_arguments_schema(cls, *args, **kwargs):
5757

5858
# define Arg Group "Identity"
5959

60+
_args_schema = cls._args_schema
61+
_args_schema.mi_system_assigned = AAZStrArg(
62+
options=["--system-assigned", "--mi-system-assigned"],
63+
arg_group="Identity",
64+
help="Set the system managed identity.",
65+
blank="True",
66+
)
67+
_args_schema.mi_user_assigned = AAZListArg(
68+
options=["--user-assigned", "--mi-user-assigned"],
69+
arg_group="Identity",
70+
help="Set the user managed identities.",
71+
blank=[],
72+
)
73+
74+
mi_user_assigned = cls._args_schema.mi_user_assigned
75+
mi_user_assigned.Element = AAZStrArg()
76+
6077
# define Arg Group "Properties"
6178

6279
_args_schema = cls._args_schema
@@ -89,25 +106,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
89106

90107
tags = cls._args_schema.tags
91108
tags.Element = AAZStrArg()
92-
93-
# define Arg Group "Properties.identity"
94-
95-
_args_schema = cls._args_schema
96-
_args_schema.system_assigned = AAZStrArg(
97-
options=["--system-assigned"],
98-
arg_group="Properties.identity",
99-
help="Set the system managed identity.",
100-
blank="True",
101-
)
102-
_args_schema.user_assigned = AAZListArg(
103-
options=["--user-assigned"],
104-
arg_group="Properties.identity",
105-
help="Set the user managed identities.",
106-
blank=[],
107-
)
108-
109-
user_assigned = cls._args_schema.user_assigned
110-
user_assigned.Element = AAZStrArg()
111109
return cls._args_schema
112110

113111
def _execute_operations(self):
@@ -222,8 +220,8 @@ def content(self):
222220

223221
identity = _builder.get(".identity")
224222
if identity is not None:
225-
identity.set_prop("userAssigned", AAZListType, ".user_assigned", typ_kwargs={"flags": {"action": "create"}})
226-
identity.set_prop("systemAssigned", AAZStrType, ".system_assigned", typ_kwargs={"flags": {"action": "create"}})
223+
identity.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "create"}})
224+
identity.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "create"}})
227225

228226
user_assigned = _builder.get(".identity.userAssigned")
229227
if user_assigned is not None:

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/bootstrapdevice/identity/_assign.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ def _build_arguments_schema(cls, *args, **kwargs):
5858
# define Arg Group "Properties.identity"
5959

6060
_args_schema = cls._args_schema
61-
_args_schema.system_assigned = AAZStrArg(
62-
options=["--system-assigned"],
61+
_args_schema.mi_system_assigned = AAZStrArg(
62+
options=["--system-assigned", "--mi-system-assigned"],
6363
arg_group="Properties.identity",
6464
help="Set the system managed identity.",
6565
blank="True",
6666
)
67-
_args_schema.user_assigned = AAZListArg(
68-
options=["--user-assigned"],
67+
_args_schema.mi_user_assigned = AAZListArg(
68+
options=["--user-assigned", "--mi-user-assigned"],
6969
arg_group="Properties.identity",
7070
help="Set the user managed identities.",
7171
blank=[],
7272
)
7373

74-
user_assigned = cls._args_schema.user_assigned
75-
user_assigned.Element = AAZStrArg()
74+
mi_user_assigned = cls._args_schema.mi_user_assigned
75+
mi_user_assigned.Element = AAZStrArg()
7676
return cls._args_schema
7777

7878
def _execute_operations(self):
@@ -316,8 +316,8 @@ def _update_instance(self, instance):
316316
value=instance,
317317
typ=AAZIdentityObjectType
318318
)
319-
_builder.set_prop("userAssigned", AAZListType, ".user_assigned", typ_kwargs={"flags": {"action": "assign"}})
320-
_builder.set_prop("systemAssigned", AAZStrType, ".system_assigned", typ_kwargs={"flags": {"action": "assign"}})
319+
_builder.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "assign"}})
320+
_builder.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "assign"}})
321321

322322
user_assigned = _builder.get(".userAssigned")
323323
if user_assigned is not None:

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/bootstrapdevice/identity/_remove.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ def _build_arguments_schema(cls, *args, **kwargs):
5858
# define Arg Group "Properties.identity"
5959

6060
_args_schema = cls._args_schema
61-
_args_schema.system_assigned = AAZStrArg(
62-
options=["--system-assigned"],
61+
_args_schema.mi_system_assigned = AAZStrArg(
62+
options=["--system-assigned", "--mi-system-assigned"],
6363
arg_group="Properties.identity",
6464
help="Set the system managed identity.",
6565
blank="True",
6666
)
67-
_args_schema.user_assigned = AAZListArg(
68-
options=["--user-assigned"],
67+
_args_schema.mi_user_assigned = AAZListArg(
68+
options=["--user-assigned", "--mi-user-assigned"],
6969
arg_group="Properties.identity",
7070
help="Set the user managed identities.",
7171
blank=[],
7272
)
7373

74-
user_assigned = cls._args_schema.user_assigned
75-
user_assigned.Element = AAZStrArg()
74+
mi_user_assigned = cls._args_schema.mi_user_assigned
75+
mi_user_assigned.Element = AAZStrArg()
7676
return cls._args_schema
7777

7878
def _execute_operations(self):
@@ -316,8 +316,8 @@ def _update_instance(self, instance):
316316
value=instance,
317317
typ=AAZIdentityObjectType
318318
)
319-
_builder.set_prop("userAssigned", AAZListType, ".user_assigned", typ_kwargs={"flags": {"action": "remove"}})
320-
_builder.set_prop("systemAssigned", AAZStrType, ".system_assigned", typ_kwargs={"flags": {"action": "remove"}})
319+
_builder.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "remove"}})
320+
_builder.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "remove"}})
321321

322322
user_assigned = _builder.get(".userAssigned")
323323
if user_assigned is not None:

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/controller/_create.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,21 @@ def _build_arguments_schema(cls, *args, **kwargs):
6363
# define Arg Group "Identity"
6464

6565
_args_schema = cls._args_schema
66-
_args_schema.system_assigned = AAZStrArg(
67-
options=["--system-assigned"],
66+
_args_schema.mi_system_assigned = AAZStrArg(
67+
options=["--system-assigned", "--mi-system-assigned"],
6868
arg_group="Identity",
6969
help="Set the system managed identity.",
7070
blank="True",
7171
)
72-
_args_schema.user_assigned = AAZListArg(
73-
options=["--user-assigned"],
72+
_args_schema.mi_user_assigned = AAZListArg(
73+
options=["--user-assigned", "--mi-user-assigned"],
7474
arg_group="Identity",
7575
help="Set the user managed identities.",
7676
blank=[],
7777
)
7878

79-
user_assigned = cls._args_schema.user_assigned
80-
user_assigned.Element = AAZStrArg()
79+
mi_user_assigned = cls._args_schema.mi_user_assigned
80+
mi_user_assigned.Element = AAZStrArg()
8181

8282
# define Arg Group "Properties"
8383

@@ -313,8 +313,8 @@ def content(self):
313313

314314
identity = _builder.get(".identity")
315315
if identity is not None:
316-
identity.set_prop("userAssigned", AAZListType, ".user_assigned", typ_kwargs={"flags": {"action": "create"}})
317-
identity.set_prop("systemAssigned", AAZStrType, ".system_assigned", typ_kwargs={"flags": {"action": "create"}})
316+
identity.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "create"}})
317+
identity.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "create"}})
318318

319319
user_assigned = _builder.get(".identity.userAssigned")
320320
if user_assigned is not None:

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/controller/_update.py‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,23 @@ def _build_arguments_schema(cls, *args, **kwargs):
6363

6464
# define Arg Group "Identity"
6565

66+
_args_schema = cls._args_schema
67+
_args_schema.mi_system_assigned = AAZStrArg(
68+
options=["--system-assigned", "--mi-system-assigned"],
69+
arg_group="Identity",
70+
help="Set the system managed identity.",
71+
blank="True",
72+
)
73+
_args_schema.mi_user_assigned = AAZListArg(
74+
options=["--user-assigned", "--mi-user-assigned"],
75+
arg_group="Identity",
76+
help="Set the user managed identities.",
77+
blank=[],
78+
)
79+
80+
mi_user_assigned = cls._args_schema.mi_user_assigned
81+
mi_user_assigned.Element = AAZStrArg()
82+
6683
# define Arg Group "Properties"
6784

6885
_args_schema = cls._args_schema
@@ -92,25 +109,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
92109

93110
tags = cls._args_schema.tags
94111
tags.Element = AAZStrArg()
95-
96-
# define Arg Group "Properties.identity"
97-
98-
_args_schema = cls._args_schema
99-
_args_schema.system_assigned = AAZStrArg(
100-
options=["--system-assigned"],
101-
arg_group="Properties.identity",
102-
help="Set the system managed identity.",
103-
blank="True",
104-
)
105-
_args_schema.user_assigned = AAZListArg(
106-
options=["--user-assigned"],
107-
arg_group="Properties.identity",
108-
help="Set the user managed identities.",
109-
blank=[],
110-
)
111-
112-
user_assigned = cls._args_schema.user_assigned
113-
user_assigned.Element = AAZStrArg()
114112
return cls._args_schema
115113

116114
_args_express_route_connection_information_update = None
@@ -251,8 +249,8 @@ def content(self):
251249

252250
identity = _builder.get(".identity")
253251
if identity is not None:
254-
identity.set_prop("userAssigned", AAZListType, ".user_assigned", typ_kwargs={"flags": {"action": "create"}})
255-
identity.set_prop("systemAssigned", AAZStrType, ".system_assigned", typ_kwargs={"flags": {"action": "create"}})
252+
identity.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "create"}})
253+
identity.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "create"}})
256254

257255
user_assigned = _builder.get(".identity.userAssigned")
258256
if user_assigned is not None:

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/controller/identity/_assign.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ def _build_arguments_schema(cls, *args, **kwargs):
5858
# define Arg Group "Properties.identity"
5959

6060
_args_schema = cls._args_schema
61-
_args_schema.system_assigned = AAZStrArg(
62-
options=["--system-assigned"],
61+
_args_schema.mi_system_assigned = AAZStrArg(
62+
options=["--system-assigned", "--mi-system-assigned"],
6363
arg_group="Properties.identity",
6464
help="Set the system managed identity.",
6565
blank="True",
6666
)
67-
_args_schema.user_assigned = AAZListArg(
68-
options=["--user-assigned"],
67+
_args_schema.mi_user_assigned = AAZListArg(
68+
options=["--user-assigned", "--mi-user-assigned"],
6969
arg_group="Properties.identity",
7070
help="Set the user managed identities.",
7171
blank=[],
7272
)
7373

74-
user_assigned = cls._args_schema.user_assigned
75-
user_assigned.Element = AAZStrArg()
74+
mi_user_assigned = cls._args_schema.mi_user_assigned
75+
mi_user_assigned.Element = AAZStrArg()
7676
return cls._args_schema
7777

7878
def _execute_operations(self):
@@ -316,8 +316,8 @@ def _update_instance(self, instance):
316316
value=instance,
317317
typ=AAZIdentityObjectType
318318
)
319-
_builder.set_prop("userAssigned", AAZListType, ".user_assigned", typ_kwargs={"flags": {"action": "assign"}})
320-
_builder.set_prop("systemAssigned", AAZStrType, ".system_assigned", typ_kwargs={"flags": {"action": "assign"}})
319+
_builder.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "assign"}})
320+
_builder.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "assign"}})
321321

322322
user_assigned = _builder.get(".userAssigned")
323323
if user_assigned is not None:

‎src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/controller/identity/_remove.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ def _build_arguments_schema(cls, *args, **kwargs):
5858
# define Arg Group "Properties.identity"
5959

6060
_args_schema = cls._args_schema
61-
_args_schema.system_assigned = AAZStrArg(
62-
options=["--system-assigned"],
61+
_args_schema.mi_system_assigned = AAZStrArg(
62+
options=["--system-assigned", "--mi-system-assigned"],
6363
arg_group="Properties.identity",
6464
help="Set the system managed identity.",
6565
blank="True",
6666
)
67-
_args_schema.user_assigned = AAZListArg(
68-
options=["--user-assigned"],
67+
_args_schema.mi_user_assigned = AAZListArg(
68+
options=["--user-assigned", "--mi-user-assigned"],
6969
arg_group="Properties.identity",
7070
help="Set the user managed identities.",
7171
blank=[],
7272
)
7373

74-
user_assigned = cls._args_schema.user_assigned
75-
user_assigned.Element = AAZStrArg()
74+
mi_user_assigned = cls._args_schema.mi_user_assigned
75+
mi_user_assigned.Element = AAZStrArg()
7676
return cls._args_schema
7777

7878
def _execute_operations(self):
@@ -316,8 +316,8 @@ def _update_instance(self, instance):
316316
value=instance,
317317
typ=AAZIdentityObjectType
318318
)
319-
_builder.set_prop("userAssigned", AAZListType, ".user_assigned", typ_kwargs={"flags": {"action": "remove"}})
320-
_builder.set_prop("systemAssigned", AAZStrType, ".system_assigned", typ_kwargs={"flags": {"action": "remove"}})
319+
_builder.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "remove"}})
320+
_builder.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "remove"}})
321321

322322
user_assigned = _builder.get(".userAssigned")
323323
if user_assigned is not None:

0 commit comments

Comments
 (0)