Skip to content

Commit 3a2c320

Browse files
author
malpaniHMC
authored
Minor Fixes for TrafficController 2022-10-01-preview (#22888)
* regex changes * enum errors * reverting enum changes, uupdating cadl, updating regex * reverting example enum changes
1 parent c417434 commit 3a2c320

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/cadl/TrafficController.cadl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ model FrontendProperties {
4242
@doc("Frontend Public IP Address (Optional).")
4343
publicIPAddress?: FrontendPropertiesIPAddress;
4444
@visibility("read")
45-
@doc("test doc")
45+
@doc("Provisioning State of Traffic Controller Frontend Resource")
4646
provisioningState?: ProvisioningState;
4747
}
4848

@@ -79,7 +79,7 @@ model AssociationProperties {
7979
@doc("Association Subnet")
8080
subnet?: AssociationSubnet;
8181
@visibility("read")
82-
@doc("Provisioning State")
82+
@doc("Provisioning State of Traffic Controller Association Resource")
8383
provisioningState?: ProvisioningState;
8484

8585
}
@@ -120,17 +120,17 @@ model TrafficControllerProperties {
120120
provisioningState?: ProvisioningState;
121121
}
122122

123-
@knownValues(ProvisioningStateKV)
124-
model ProvisioningState is string;
125-
126123
@lroStatus
127-
enum ProvisioningStateKV {
128-
...ResourceProvisioningStateKV,
124+
enum ProvisioningState{
129125
Provisioning,
130126
Updating,
131127
Deleting,
132128
Accepted,
129+
Succeeded,
130+
Failed,
131+
Canceled
133132
}
133+
134134
@doc("Resource ID definition used by parent to reference child resources.")
135135
model ResourceID{
136136
@doc("Resource ID of child resource.")
@@ -147,7 +147,7 @@ interface FrontendsInterface extends ResourceInstanceOperations<Frontend, Fronte
147147
}
148148

149149
@armResourceOperations
150-
interface TrafficControllerInterface extends ResourceOperations<TrafficController, TrafficControllerProperties>{
150+
interface TrafficControllerInterface extends ResourceInstanceOperations<TrafficController, TrafficControllerProperties>{
151151
}
152152

153153
interface Operations extends Azure.ResourceManager.Operations {}

specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/cadl/examples/AssociationGet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
1515
"location": "NorthCentralUS",
1616
"properties": {
17-
"associationType": "Subnet",
17+
"associationType": "subnets",
1818
"subnet": {
1919
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
2020
},

specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/cadl/examples/AssociationPatch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"associationName": "as1",
88
"properties": {
99
"properties": {
10-
"associationType": "Subnet",
10+
"associationType": "subnets",
1111
"subnet": {
1212
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
1313
}
@@ -22,7 +22,7 @@
2222
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
2323
"location": "NorthCentralUS",
2424
"properties": {
25-
"associationType": "Subnet",
25+
"associationType": "subnets",
2626
"subnet": {
2727
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
2828
}

specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/cadl/examples/AssociationPut.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"resource": {
99
"location": "NorthCentralUS",
1010
"properties": {
11-
"associationType": "Subnet",
11+
"associationType": "subnets",
1212
"subnet": {
1313
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
1414
}
@@ -23,7 +23,7 @@
2323
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
2424
"location": "NorthCentralUS",
2525
"properties": {
26-
"associationType": "Subnet",
26+
"associationType": "subnets",
2727
"subnet": {
2828
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
2929
},
@@ -38,7 +38,7 @@
3838
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
3939
"location": "NorthCentralUS",
4040
"properties": {
41-
"associationType": "Subnet",
41+
"associationType": "subnets",
4242
"subnet": {
4343
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
4444
}

specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/cadl/examples/AssociationsGet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ServiceNetworking/trafficControllers/tc1/associations/as1",
1616
"location": "NorthCentralUS",
1717
"properties": {
18-
"associationType": "Subnet",
18+
"associationType": "subnets",
1919
"subnet": {
2020
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-tc/subnets/tc-subnet"
2121
},

specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/preview/2022-10-01-preview/TrafficController.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@
13191319
"required": true,
13201320
"description": "Name of Association",
13211321
"type": "string",
1322-
"pattern": "[A-Za-z0-9]*",
1322+
"pattern": "[A-Za-z0-9]+[A-Za-z0-9-_.]{0,62}[A-Za-z0-9_]+",
13231323
"x-ms-parameter-location": "method"
13241324
},
13251325
"Frontend.frontendName": {
@@ -1328,7 +1328,7 @@
13281328
"required": true,
13291329
"description": "Frontends",
13301330
"type": "string",
1331-
"pattern": "[A-Za-z0-9]*",
1331+
"pattern": "[A-Za-z0-9]+[A-Za-z0-9-_.]{0,62}[A-Za-z0-9_]+",
13321332
"x-ms-parameter-location": "method"
13331333
},
13341334
"TrafficController.trafficControllerName": {
@@ -1337,7 +1337,7 @@
13371337
"required": true,
13381338
"description": "traffic controller name for path",
13391339
"type": "string",
1340-
"pattern": "[A-Za-z0-9]*",
1340+
"pattern": "[A-Za-z0-9]+[A-Za-z0-9-_.]{0,62}[A-Za-z0-9_]+",
13411341
"x-ms-parameter-location": "method"
13421342
}
13431343
}

0 commit comments

Comments
 (0)