Skip to content

Minor Fixes for TrafficController 2022-10-01-preview #22888

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
allenjzhang merged 4 commits into from
Mar 3, 2023
Merged

Minor Fixes for TrafficController 2022-10-01-preview #22888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44cee97
regex changes
Mar 3, 2023
55c1276
enum errors
Mar 3, 2023
ec744fd
reverting enum changes, uupdating cadl, updating regex
Mar 3, 2023
4ff04ab
reverting example enum changes
Mar 3, 2023
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
16 changes: 8 additions & 8 deletions ...ervicenetworking/resource-manager/Microsoft.ServiceNetworking/cadl/TrafficController.cadl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ model FrontendProperties {
@doc("Frontend Public IP Address (Optional).")
publicIPAddress?: FrontendPropertiesIPAddress;
@visibility("read")
@doc("test doc")
@doc("Provisioning State of Traffic Controller Frontend Resource")
provisioningState?: ProvisioningState;
}

Expand Down Expand Up @@ -79,7 +79,7 @@ model AssociationProperties {
@doc("Association Subnet")
subnet?: AssociationSubnet;
@visibility("read")
@doc("Provisioning State")
@doc("Provisioning State of Traffic Controller Association Resource")
provisioningState?: ProvisioningState;

}
Expand Down Expand Up @@ -120,17 +120,17 @@ model TrafficControllerProperties {
provisioningState?: ProvisioningState;
}

@knownValues(ProvisioningStateKV)
model ProvisioningState is string;

@lroStatus
enum ProvisioningStateKV {
...ResourceProvisioningStateKV,
enum ProvisioningState{
Provisioning,
Updating,
Deleting,
Accepted,
Succeeded,
Failed,
Canceled
}

@doc("Resource ID definition used by parent to reference child resources.")
model ResourceID{
@doc("Resource ID of child resource.")
Expand All @@ -147,7 +147,7 @@ interface FrontendsInterface extends ResourceInstanceOperations<Frontend, Fronte
}

@armResourceOperations
interface TrafficControllerInterface extends ResourceOperations<TrafficController, TrafficControllerProperties>{
interface TrafficControllerInterface extends ResourceInstanceOperations<TrafficController, TrafficControllerProperties>{
}

interface Operations extends Azure.ResourceManager.Operations {}
2 changes: 1 addition & 1 deletion ...networking/resource-manager/Microsoft.ServiceNetworking/cadl/examples/AssociationGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
"location": "NorthCentralUS",
"properties": {
"associationType": "Subnet",
"associationType": "subnets",
"subnet": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
},
Expand Down
4 changes: 2 additions & 2 deletions ...tworking/resource-manager/Microsoft.ServiceNetworking/cadl/examples/AssociationPatch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"associationName": "as1",
"properties": {
"properties": {
"associationType": "Subnet",
"associationType": "subnets",
"subnet": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
}
Expand All @@ -22,7 +22,7 @@
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
"location": "NorthCentralUS",
"properties": {
"associationType": "Subnet",
"associationType": "subnets",
"subnet": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
}
Expand Down
6 changes: 3 additions & 3 deletions ...networking/resource-manager/Microsoft.ServiceNetworking/cadl/examples/AssociationPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"resource": {
"location": "NorthCentralUS",
"properties": {
"associationType": "Subnet",
"associationType": "subnets",
"subnet": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
}
Expand All @@ -23,7 +23,7 @@
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
"location": "NorthCentralUS",
"properties": {
"associationType": "Subnet",
"associationType": "subnets",
"subnet": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
},
Expand All @@ -38,7 +38,7 @@
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
"location": "NorthCentralUS",
"properties": {
"associationType": "Subnet",
"associationType": "subnets",
"subnet": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
}
Expand Down
2 changes: 1 addition & 1 deletion ...etworking/resource-manager/Microsoft.ServiceNetworking/cadl/examples/AssociationsGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
"location": "NorthCentralUS",
"properties": {
"associationType": "Subnet",
"associationType": "subnets",
"subnet": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
},
Expand Down
6 changes: 3 additions & 3 deletions ...rce-manager/Microsoft.ServiceNetworking/preview/2022-10-01-preview/TrafficController.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@
"required": true,
"description": "Name of Association",
"type": "string",
"pattern": "[A-Za-z0-9]*",
"pattern": "[A-Za-z0-9]+[A-Za-z0-9-_.]{0,62}[A-Za-z0-9_]+",
"x-ms-parameter-location": "method"
},
"Frontend.frontendName": {
Expand All @@ -1328,7 +1328,7 @@
"required": true,
"description": "Frontends",
"type": "string",
"pattern": "[A-Za-z0-9]*",
"pattern": "[A-Za-z0-9]+[A-Za-z0-9-_.]{0,62}[A-Za-z0-9_]+",
"x-ms-parameter-location": "method"
},
"TrafficController.trafficControllerName": {
Expand All @@ -1337,7 +1337,7 @@
"required": true,
"description": "traffic controller name for path",
"type": "string",
"pattern": "[A-Za-z0-9]*",
"pattern": "[A-Za-z0-9]+[A-Za-z0-9-_.]{0,62}[A-Za-z0-9_]+",
"x-ms-parameter-location": "method"
}
}
Expand Down