Skip to content
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.

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

sdk, tspconfig for vmware - merge interfaces #29336

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3e2bad2
java, tspconfig for vmware
weidongxu-microsoft Jun 4, 2024
2e5b359
client.tsp
weidongxu-microsoft Jun 4, 2024
c6295ba
fix service-dir
weidongxu-microsoft Jun 4, 2024
8a61801
flatten
weidongxu-microsoft Jun 4, 2024
80423b0
rename
weidongxu-microsoft Jun 4, 2024
2c5e0e8
rename
weidongxu-microsoft Jun 4, 2024
2c6e8e8
suppress
weidongxu-microsoft Jun 4, 2024
b5afded
format
weidongxu-microsoft Jun 4, 2024
ce474e2
Merge branch 'main' into java_tsp-conf_vmware
weidongxu-microsoft Jun 4, 2024
abcc864
rename
weidongxu-microsoft Jun 4, 2024
1826d34
format
weidongxu-microsoft Jun 4, 2024
08ad783
use friendlyName
weidongxu-microsoft Jun 4, 2024
0d0fe2a
remove java
weidongxu-microsoft Jun 4, 2024
fd8bc65
format
weidongxu-microsoft Jun 4, 2024
1adc195
rename
weidongxu-microsoft Jun 4, 2024
3b5fb15
flatten
weidongxu-microsoft Jun 4, 2024
3c4baa7
suppress
weidongxu-microsoft Jun 4, 2024
9d8942e
Update tspconfig.yaml
msyyc Jun 4, 2024
a17ecba
update
weidongxu-microsoft Jun 5, 2024
aee5dd1
Merge branch 'main' into java_tsp-conf_vmware
weidongxu-microsoft Jun 5, 2024
0d74042
format
weidongxu-microsoft Jun 5, 2024
7105e2d
merge interface
weidongxu-microsoft Jun 5, 2024
6beade6
regen
weidongxu-microsoft Jun 5, 2024
1e45eb2
merge to WorkloadNetworks interface
weidongxu-microsoft Jun 5, 2024
3f33367
update
weidongxu-microsoft Jun 5, 2024
ac83546
Merge branch 'java_tsp-conf_vmware' into java_tsp-conf_vmware_interface
weidongxu-microsoft Jun 5, 2024
cd8cf80
Merge branch 'java_tsp-conf_vmware_interface' of https://github.com/w…
weidongxu-microsoft Jun 5, 2024
1418642
limit rename of Id/Ip to java
weidongxu-microsoft Jun 5, 2024
6019037
Merge branch 'java_tsp-conf_vmware' into java_tsp-conf_vmware_interface
weidongxu-microsoft Jun 5, 2024
8a8cd2a
tsv
weidongxu-microsoft Jun 5, 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
86 changes: 86 additions & 0 deletions specification/vmware/Microsoft.AVS/client.tsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import "@azure-tools/typespec-client-generator-core";
import "@azure-tools/typespec-azure-resource-manager";

import "./main.tsp";

using Azure.ClientGenerator.Core;
using Microsoft.AVS;

// client
@@clientName(Microsoft.AVS, "Avs", "java");

// flatten
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(Azure.ResourceManager.TrackedResource.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(Azure.ResourceManager.Foundations.ResourceUpdateModel.properties
);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(Azure.ResourceManager.ProxyResource.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(Azure.ResourceManager.Foundations.ProxyResourceUpdateModel.properties
);

#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(PrivateCloudUpdate.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(ClusterUpdate.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(WorkloadNetworkSegmentUpdate.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(WorkloadNetworkDhcpUpdate.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(WorkloadNetworkPortMirroringUpdate.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(WorkloadNetworkVMGroupUpdate.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(WorkloadNetworkDnsServiceUpdate.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(WorkloadNetworkDnsZoneUpdate.properties);
#suppress "deprecated" "property flatten for SDK backward compatibility"
@@flattenProperty(PlacementPolicyUpdate.properties);

// operation
@@friendlyName(Addons.list, "list");
@@friendlyName(PlacementPolicies.list, "list");
@@friendlyName(VirtualMachines.list, "list");
@@friendlyName(HcxEnterpriseSites.list, "list");
@@friendlyName(ScriptExecutions.list, "list");
@@friendlyName(ScriptPackages.list, "list");
@@friendlyName(Datastores.list, "list");
@@friendlyName(Clusters.list, "list");
@@friendlyName(ScriptCmdlets.list, "list");
@@friendlyName(Authorizations.list, "list");
@@friendlyName(CloudLinks.list, "list");
@@friendlyName(GlobalReachConnections.list, "list");
@@friendlyName(WorkloadNetworks.list, "list");

// model
@@clientName(Azure.ResourceManager.Foundations.SystemAssignedServiceIdentity,
"PrivateCloudIdentity"
);
@@clientName(Azure.ResourceManager.Foundations.SystemAssignedServiceIdentityType,
"ResourceIdentityType"
);

@@clientName(VmVmPlacementPolicyProperties, "VmPlacementPolicyProperties");
@@clientName(WorkloadNetworkPublicIP, "WorkloadNetworkPublicIp", "java");
@@clientName(WorkloadNetworkPublicIPProvisioningState,
"WorkloadNetworkPublicIpProvisioningState",
"java"
);

// property
@@clientName(Circuit.expressRouteID, "expressRouteId", "java");
@@clientName(Circuit.expressRoutePrivatePeeringID,
"expressRoutePrivatePeeringId",
"java"
);
@@clientName(WorkloadNetworkPublicIPProperties,
"WorkloadNetworkPublicIpProperties",
"java"
);
@@clientName(WorkloadNetworkPublicIPProperties.publicIPBlock,
"publicIpBlock",
"java"
);
23 changes: 10 additions & 13 deletions specification/vmware/Microsoft.AVS/routes.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -279,26 +279,23 @@ interface WorkloadNetworks {
#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_List")
list is ArmResourceListByParent<WorkloadNetwork>;
}

@armResourceOperations
interface WorkloadNetworkSegments {
#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_ListSegments")
list is ArmResourceListByParent<WorkloadNetworkSegment>;
listSegments is ArmResourceListByParent<WorkloadNetworkSegment>;

#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_GetSegment")
get is ArmResourceRead<WorkloadNetworkSegment>;
getSegment is ArmResourceRead<WorkloadNetworkSegment>;

#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_CreateSegments")
create is ArmResourceCreateOrUpdateAsync<WorkloadNetworkSegment>;
createSegments is ArmResourceCreateOrUpdateAsync<WorkloadNetworkSegment>;

#suppress "@azure-tools/typespec-azure-core/no-operation-id" "Can not change existing operationId."
@operationId("WorkloadNetworks_UpdateSegments")
@parameterVisibility
update is ArmCustomPatchAsync<
updateSegments is ArmCustomPatchAsync<
WorkloadNetworkSegment,
WorkloadNetworkSegmentUpdate
>;
Expand All @@ -310,27 +307,27 @@ interface WorkloadNetworkSegments {
deleteSegment is ArmResourceDeleteAsync<WorkloadNetworkSegment>;
}

@@encodedName(WorkloadNetworkSegments.create::parameters.resource,
@@encodedName(WorkloadNetworks.createSegments::parameters.resource,
"application/json",
"workloadNetworkSegment"
);
@@clientName(WorkloadNetworkSegments.create::parameters.resource,
@@clientName(WorkloadNetworks.createSegments::parameters.resource,
"workloadNetworkSegment"
);
@@OpenAPI.extension(WorkloadNetworkSegments.create::parameters.resource,
@@OpenAPI.extension(WorkloadNetworks.createSegments::parameters.resource,
"x-ms-client-name",
"workloadNetworkSegment"
);

@@encodedName(WorkloadNetworkSegments.update::parameters.properties,
@@encodedName(WorkloadNetworks.updateSegments::parameters.properties,
"application/json",
"workloadNetworkSegment"
);
@@clientName(WorkloadNetworkSegments.update::parameters.properties,
@@clientName(WorkloadNetworks.updateSegments::parameters.properties,
"application/json",
"workloadNetworkSegment"
);
@@OpenAPI.extension(WorkloadNetworkSegments.update::parameters.properties,
@@OpenAPI.extension(WorkloadNetworks.updateSegments::parameters.properties,
"x-ms-client-name",
"workloadNetworkSegment"
);
Expand Down
12 changes: 11 additions & 1 deletion specification/vmware/Microsoft.AVS/tspconfig.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
"service-dir":
default: "sdk/vmware"
default: "sdk/avs"
"service-directory-name":
default: "vmware"
emit: ["@azure-tools/typespec-autorest"]
Expand All @@ -15,3 +15,13 @@ options:
output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/vmware.json"
omit-unreachable-types: true
use-read-only-status-schema: true
"@azure-tools/typespec-python":
package-dir: "azure-mgmt-avs"
package-name: "{package-dir}"
flavor: azure
"@azure-tools/typespec-java":
package-dir: "azure-resourcemanager-avs"
flavor: azure
namespace: "com.azure.resourcemanager.avs"
service-name: "Avs"
examples-directory: "examples"
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
{
"name": "WorkloadNetworks"
},
{
"name": "WorkloadNetworkSegments"
},
{
"name": "WorkloadNetworkGateways"
},
Expand Down Expand Up @@ -5754,7 +5751,7 @@
"get": {
"operationId": "WorkloadNetworks_ListSegments",
"tags": [
"WorkloadNetworkSegments"
"WorkloadNetworks"
],
"description": "List WorkloadNetworkSegment resources by WorkloadNetwork",
"parameters": [
Expand Down Expand Up @@ -5804,7 +5801,7 @@
"get": {
"operationId": "WorkloadNetworks_GetSegment",
"tags": [
"WorkloadNetworkSegments"
"WorkloadNetworks"
],
"description": "Get a WorkloadNetworkSegment",
"parameters": [
Expand Down Expand Up @@ -5857,7 +5854,7 @@
"put": {
"operationId": "WorkloadNetworks_CreateSegments",
"tags": [
"WorkloadNetworkSegments"
"WorkloadNetworks"
],
"description": "Create a WorkloadNetworkSegment",
"parameters": [
Expand Down Expand Up @@ -5937,7 +5934,7 @@
"patch": {
"operationId": "WorkloadNetworks_UpdateSegments",
"tags": [
"WorkloadNetworkSegments"
"WorkloadNetworks"
],
"description": "Update a WorkloadNetworkSegment",
"parameters": [
Expand Down Expand Up @@ -6018,7 +6015,7 @@
"delete": {
"operationId": "WorkloadNetworks_DeleteSegment",
"tags": [
"WorkloadNetworkSegments"
"WorkloadNetworks"
],
"description": "Delete a WorkloadNetworkSegment",
"parameters": [
Expand Down