Skip to content

tsp, avs, remove Update model to keep consistency with stable Swagger #29392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weidongxu-microsoft merged 7 commits into from
Jun 17, 2024
Merged

tsp, avs, remove Update model to keep consistency with stable Swagger #29392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30098cd
avs, tsp, remove Update model to keep consistency in Swagger
weidongxu-microsoft Jun 11, 2024
317e37d
tsv
weidongxu-microsoft Jun 11, 2024
bf0be87
remove Update model
weidongxu-microsoft Jun 11, 2024
600a8ba
remove WorkloadNetworkDhcpUpdate
weidongxu-microsoft Jun 13, 2024
78458ba
Merge branch 'main' into avs_remove-Update-model
weidongxu-microsoft Jun 13, 2024
4c40f79
Merge branch 'main' into avs_remove-Update-model
weidongxu-microsoft Jun 14, 2024
0c96e22
Merge branch 'main' into avs_remove-Update-model
weidongxu-microsoft Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions specification/vmware/Microsoft.AVS/models.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,13 +1248,6 @@ model WorkloadNetworkSegment
name: string;
}

@doc("NSX Segment update")
model WorkloadNetworkSegmentUpdate {
@doc("The updatable properties of a Segment update")
@extension("x-ms-client-flatten", true)
properties?: WorkloadNetworkSegmentProperties;
}

@doc("NSX Segment Properties")
model WorkloadNetworkSegmentProperties {
@doc("Display name of the segment.")
Expand Down Expand Up @@ -1317,13 +1310,6 @@ model DhcpIdParameter {
dhcpId: string;
}

@doc("NSX DHCP update")
model WorkloadNetworkDhcpUpdate {
@doc("The updatable properties of a DHCP update")
@extension("x-ms-client-flatten", false)
properties?: WorkloadNetworkDhcpEntity;
}

@doc("Type of DHCP: SERVER or RELAY.")
union DhcpTypeEnum {
SERVER: "SERVER",
Expand Down Expand Up @@ -1423,13 +1409,6 @@ model PortMirroringProfileParameter {
portMirroringId: string;
}

@doc("NSX Port Mirroring update")
model WorkloadNetworkPortMirroringUpdate {
@doc("The updatable properties of a Port Mirroring update")
@extension("x-ms-client-flatten", true)
properties?: WorkloadNetworkPortMirroringProperties;
}

@doc("NSX Port Mirroring Properties")
model WorkloadNetworkPortMirroringProperties {
@doc("Display name of the port mirroring profile.")
Expand Down Expand Up @@ -1477,14 +1456,6 @@ model VmGroupIdParameter {
vmGroupId: string;
}

#suppress "@azure-tools/typespec-azure-core/casing-style" "Can not change existing name."
@doc("NSX VM Group update")
model WorkloadNetworkVMGroupUpdate {
@doc("The updatable properties of a VM Group update")
@extension("x-ms-client-flatten", true)
properties?: WorkloadNetworkVMGroupProperties;
}

#suppress "@azure-tools/typespec-azure-core/casing-style" "Can not change existing name."
@doc("NSX VM Group Properties")
model WorkloadNetworkVMGroupProperties {
Expand Down Expand Up @@ -1552,13 +1523,6 @@ model DnsServiceIdParameter {
dnsServiceId: string;
}

@doc("NSX DNS Service update")
model WorkloadNetworkDnsServiceUpdate {
@doc("The updatable properties of a DNS Service update")
@extension("x-ms-client-flatten", true)
properties?: WorkloadNetworkDnsServiceProperties;
}

@doc("NSX DNS Service Properties")
model WorkloadNetworkDnsServiceProperties {
@doc("Display name of the DNS Service.")
Expand Down Expand Up @@ -1608,13 +1572,6 @@ model DnsZoneIdParameter {
dnsZoneId: string;
}

@doc("NSX DNS Zone update")
model WorkloadNetworkDnsZoneUpdate {
@doc("The updatable properties of a DNS Zone update")
@extension("x-ms-client-flatten", true)
properties?: WorkloadNetworkDnsZoneProperties;
}

@doc("NSX DNS Zone Properties")
model WorkloadNetworkDnsZoneProperties {
@doc("Display name of the DNS Zone.")
Expand Down
22 changes: 7 additions & 15 deletions specification/vmware/Microsoft.AVS/routes.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,7 @@ interface WorkloadNetworkSegments {
#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_UpdateSegments")
@parameterVisibility
update is ArmCustomPatchAsync<
WorkloadNetworkSegment,
WorkloadNetworkSegmentUpdate
>;
update is ArmCustomPatchAsync<WorkloadNetworkSegment, WorkloadNetworkSegment>;

#suppress "deprecated"
#suppress "@azure-tools/typespec-azure-resource-manager/arm-delete-operation-response-codes"
Expand Down Expand Up @@ -425,7 +422,8 @@ interface WorkloadNetworkDhcpConfigurations {

#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_UpdateDhcp")
update is ArmCustomPatchAsync<WorkloadNetworkDhcp, WorkloadNetworkDhcpUpdate>;
@parameterVisibility
update is ArmCustomPatchAsync<WorkloadNetworkDhcp, WorkloadNetworkDhcp>;

#suppress "deprecated"
#suppress "@azure-tools/typespec-azure-resource-manager/arm-delete-operation-response-codes"
Expand Down Expand Up @@ -514,7 +512,7 @@ interface WorkloadNetworkPortMirroringProfiles {
@parameterVisibility
update is ArmCustomPatchAsync<
WorkloadNetworkPortMirroring,
WorkloadNetworkPortMirroringUpdate
WorkloadNetworkPortMirroring
>;

#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-operation" "PortMirroringProfileParameter should be last, but it is breaking to correct it."
Expand Down Expand Up @@ -594,10 +592,7 @@ interface WorkloadNetworkVmGroups {
#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_UpdateVMGroup")
@parameterVisibility
update is ArmCustomPatchAsync<
WorkloadNetworkVMGroup,
WorkloadNetworkVMGroupUpdate
>;
update is ArmCustomPatchAsync<WorkloadNetworkVMGroup, WorkloadNetworkVMGroup>;

#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-operation" "VmGroupIdParameter should be last, but it is breaking to correct it."
#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
Expand Down Expand Up @@ -699,7 +694,7 @@ interface WorkloadNetworkDnsServices {
@parameterVisibility
update is ArmCustomPatchAsync<
WorkloadNetworkDnsService,
WorkloadNetworkDnsServiceUpdate
WorkloadNetworkDnsService
>;

#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-operation" "DnsServiceIdParameter should be last, but it is breaking to correct it."
Expand Down Expand Up @@ -779,10 +774,7 @@ interface WorkloadNetworkDnsZones {
#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_UpdateDnsZone")
@parameterVisibility
update is ArmCustomPatchAsync<
WorkloadNetworkDnsZone,
WorkloadNetworkDnsZoneUpdate
>;
update is ArmCustomPatchAsync<WorkloadNetworkDnsZone, WorkloadNetworkDnsZone>;

#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-operation" "DnsZoneIdParameter should be last, but it is breaking to correct it."
#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
Expand Down
143 changes: 6 additions & 137 deletions specification/vmware/resource-manager/Microsoft.AVS/stable/2023-09-01/vmware.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4366,7 +4366,7 @@
"description": "The resource properties to be updated.",
"required": true,
"schema": {
"$ref": "#/definitions/WorkloadNetworkDhcpUpdate"
"$ref": "#/definitions/WorkloadNetworkDhcp"
},
"x-ms-client-name": "workloadNetworkDhcp"
}
Expand Down Expand Up @@ -4688,7 +4688,7 @@
"description": "The resource properties to be updated.",
"required": true,
"schema": {
"$ref": "#/definitions/WorkloadNetworkDnsServiceUpdate"
"$ref": "#/definitions/WorkloadNetworkDnsService"
},
"x-ms-client-name": "workloadNetworkDnsService"
}
Expand Down Expand Up @@ -5000,7 +5000,7 @@
"description": "The resource properties to be updated.",
"required": true,
"schema": {
"$ref": "#/definitions/WorkloadNetworkDnsZoneUpdate"
"$ref": "#/definitions/WorkloadNetworkDnsZone"
},
"x-ms-client-name": "workloadNetworkDnsZone"
}
Expand Down Expand Up @@ -5417,7 +5417,7 @@
"description": "The resource properties to be updated.",
"required": true,
"schema": {
"$ref": "#/definitions/WorkloadNetworkPortMirroringUpdate"
"$ref": "#/definitions/WorkloadNetworkPortMirroring"
},
"x-ms-client-name": "workloadNetworkPortMirroring"
}
Expand Down Expand Up @@ -5975,7 +5975,7 @@
"description": "The resource properties to be updated.",
"required": true,
"schema": {
"$ref": "#/definitions/WorkloadNetworkSegmentUpdate"
"$ref": "#/definitions/WorkloadNetworkSegment"
},
"x-ms-client-name": "workloadNetworkSegment"
}
Expand Down Expand Up @@ -6405,7 +6405,7 @@
"description": "The resource properties to be updated.",
"required": true,
"schema": {
"$ref": "#/definitions/WorkloadNetworkVMGroupUpdate"
"$ref": "#/definitions/WorkloadNetworkVMGroup"
},
"x-ms-client-name": "workloadNetworkVMGroup"
}
Expand Down Expand Up @@ -10098,29 +10098,6 @@
"dhcpType"
]
},
"WorkloadNetworkDhcpEntityUpdate": {
"type": "object",
"description": "Base class for WorkloadNetworkDhcpServer and WorkloadNetworkDhcpRelay to\ninherit from",
"properties": {
"dhcpType": {
"$ref": "#/definitions/DhcpTypeEnum",
"description": "Type of DHCP: SERVER or RELAY."
},
"displayName": {
"type": "string",
"description": "Display name of the DHCP entity."
},
"revision": {
"type": "integer",
"format": "int64",
"description": "NSX revision number."
}
},
"discriminator": "dhcpType",
"required": [
"dhcpType"
]
},
"WorkloadNetworkDhcpList": {
"type": "object",
"description": "The response of a WorkloadNetworkDhcp list operation.",
Expand Down Expand Up @@ -10212,27 +10189,6 @@
],
"x-ms-discriminator-value": "RELAY"
},
"WorkloadNetworkDhcpRelayUpdate": {
"type": "object",
"description": "NSX DHCP Relay",
"properties": {
"serverAddresses": {
"type": "array",
"description": "DHCP Relay Addresses. Max 3.",
"minItems": 1,
"maxItems": 3,
"items": {
"type": "string"
}
}
},
"allOf": [
{
"$ref": "#/definitions/WorkloadNetworkDhcpEntityUpdate"
}
],
"x-ms-discriminator-value": "RELAY"
},
"WorkloadNetworkDhcpServer": {
"type": "object",
"description": "NSX DHCP Server",
Expand All @@ -10254,38 +10210,6 @@
],
"x-ms-discriminator-value": "SERVER"
},
"WorkloadNetworkDhcpServerUpdate": {
"type": "object",
"description": "NSX DHCP Server",
"properties": {
"serverAddress": {
"type": "string",
"description": "DHCP Server Address."
},
"leaseTime": {
"type": "integer",
"format": "int64",
"description": "DHCP Server Lease Time."
}
},
"allOf": [
{
"$ref": "#/definitions/WorkloadNetworkDhcpEntityUpdate"
}
],
"x-ms-discriminator-value": "SERVER"
},
"WorkloadNetworkDhcpUpdate": {
"type": "object",
"description": "NSX DHCP update",
"properties": {
"properties": {
"$ref": "#/definitions/WorkloadNetworkDhcpEntityUpdate",
"description": "The updatable properties of a DHCP update",
"x-ms-client-flatten": false
}
}
},
"WorkloadNetworkDnsService": {
"type": "object",
"description": "NSX DNS Service",
Expand Down Expand Up @@ -10395,17 +10319,6 @@
},
"readOnly": true
},
"WorkloadNetworkDnsServiceUpdate": {
"type": "object",
"description": "NSX DNS Service update",
"properties": {
"properties": {
"$ref": "#/definitions/WorkloadNetworkDnsServiceProperties",
"description": "The updatable properties of a DNS Service update",
"x-ms-client-flatten": true
}
}
},
"WorkloadNetworkDnsServicesList": {
"type": "object",
"description": "The response of a WorkloadNetworkDnsService list operation.",
Expand Down Expand Up @@ -10535,17 +10448,6 @@
},
"readOnly": true
},
"WorkloadNetworkDnsZoneUpdate": {
"type": "object",
"description": "NSX DNS Zone update",
"properties": {
"properties": {
"$ref": "#/definitions/WorkloadNetworkDnsZoneProperties",
"description": "The updatable properties of a DNS Zone update",
"x-ms-client-flatten": true
}
}
},
"WorkloadNetworkDnsZonesList": {
"type": "object",
"description": "The response of a WorkloadNetworkDnsZone list operation.",
Expand Down Expand Up @@ -10768,17 +10670,6 @@
},
"readOnly": true
},
"WorkloadNetworkPortMirroringUpdate": {
"type": "object",
"description": "NSX Port Mirroring update",
"properties": {
"properties": {
"$ref": "#/definitions/WorkloadNetworkPortMirroringProperties",
"description": "The updatable properties of a Port Mirroring update",
"x-ms-client-flatten": true
}
}
},
"WorkloadNetworkProperties": {
"type": "object",
"description": "The properties of a workload network",
Expand Down Expand Up @@ -11084,17 +10975,6 @@
}
}
},
"WorkloadNetworkSegmentUpdate": {
"type": "object",
"description": "NSX Segment update",
"properties": {
"properties": {
"$ref": "#/definitions/WorkloadNetworkSegmentProperties",
"description": "The updatable properties of a Segment update",
"x-ms-client-flatten": true
}
}
},
"WorkloadNetworkSegmentsList": {
"type": "object",
"description": "The response of a WorkloadNetworkSegment list operation.",
Expand Down Expand Up @@ -11213,17 +11093,6 @@
},
"readOnly": true
},
"WorkloadNetworkVMGroupUpdate": {
"type": "object",
"description": "NSX VM Group update",
"properties": {
"properties": {
"$ref": "#/definitions/WorkloadNetworkVMGroupProperties",
"description": "The updatable properties of a VM Group update",
"x-ms-client-flatten": true
}
}
},
"WorkloadNetworkVMGroupsList": {
"type": "object",
"description": "The response of a WorkloadNetworkVMGroup list operation.",
Expand Down