remove wrong enum values from circuit connection status and fix enum … (

#2572) * remove wrong enum values from circuit connection status and fix enum name
Azure · Mar 2, 2018 · fb621de · fb621de
1 parent 62017bc
commit fb621de
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 33 deletions.
diff --git a/...ger/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCircuitConnectionCreate.json b/...ger/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCircuitConnectionCreate.json
@@ -3,18 +3,17 @@
     "connectionName": "circuitConnectionUSAUS",
     "resourceGroupName": "rg1",
     "api-version": "2018-02-01",
-    "subscriptionId": "99c33776-9f4e-4e58-abe8-9263db1b9c6e",
+    "subscriptionId": "subid1",
     "circuitName": "ExpressRouteARMCircuitA",
     "peeringName": "AzurePrivatePeering",
     "type": "Microsoft.Network/expressRouteCircuits/peerings/connections",
-    "expressRouteCircuitConnectionsPropertiesFormat": {
-      "location": "West US",
+    "expressRouteCircuitConnectionParameters": {
       "properties": {
-        "expressroutecircuitpeering": {
-          "id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
+        "expressRouteCircuitPeering": {
+          "id": "/subscriptions/subid1/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
         },
-        "peerexpressroutecircuitpeering": {
-          "id": "/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
+        "peerExpressRouteCircuitPeering": {
+          "id": "/subscriptions/subid2/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
         },
         "authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
         "addressPrefix": "10.0.0.0/29"
@@ -24,38 +23,39 @@
   "responses": {
     "201": {
       "body": {
-        "id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/ExpressRouteARMCircuitA/peerings/AzurePrivatePeering/connections/circuitConnectionUSAUS",
+        "id": "/subscriptions/subid1/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/ExpressRouteARMCircuitA/peerings/AzurePrivatePeering/connections/circuitConnectionUSAUS",
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
         "name": "circuitConnectionUSAUS",
         "properties": {
-          "expressroutecircuitpeering": {
-            "id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
+          "expressRouteCircuitPeering": {
+            "id": "/subscriptions/subid1/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
           },
-          "peerexpressroutecircuitpeering": {
-            "id": "/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
+          "peerExpressRouteCircuitPeering": {
+            "id": "/subscriptions/subid2/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
           },
           "authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
           "addressPrefix": "10.0.0.0/24",
-          "circuitConnectionStatus": "Disconnected",
-          "provisioningState": "Updating"
+          "circuitConnectionStatus": "Connected",
+          "provisioningState":"Succeeded"
         }
       }
     },
     "200": {
       "body": {
-        "id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/ExpressRouteARMCircuitA/peerings/AzurePrivatePeering/connections/circuitConnectionUSAUS",
+        "id": "/subscriptions/subid1/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/ExpressRouteARMCircuitA/peerings/AzurePrivatePeering/connections/circuitConnectionUSAUS",
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
         "name": "circuitConnectionUSAUS",
         "properties": {
-          "expressroutecircuitpeering": {
-            "id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
+          "expressRouteCircuitPeering": {
+            "id": "/subscriptions/subid1/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
           },
-          "peerexpressroutecircuitpeering": {
-            "id": "/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
+          "peerExpressRouteCircuitPeering": {
+            "id": "/subscriptions/subid2/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
           },
           "authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
           "addressPrefix": "10.0.0.0/24",
-          "circuitConnectionStatus": "Connected"
+          "circuitConnectionStatus": "Connected",
+          "provisioningState":"Succeeded"
         }
       }
     }

diff --git a/...anager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCircuitConnectionGet.json b/...anager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCircuitConnectionGet.json
@@ -3,26 +3,27 @@
     "connectionName": "circuitConnectionUSAUS",
     "resourceGroupName": "rg1",
     "api-version": "2018-02-01",
-    "subscriptionId": "subid",
+    "subscriptionId": "subid1",
     "circuitName": "ExpressRouteARMCircuitA",
     "peeringName": "AzurePrivatePeering"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/ExpressRouteARMCircuitA/peerings/AzurePrivatePeering/connections/circuitConnectionUSAUS",
+        "id": "/subscriptions/subid1/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/ExpressRouteARMCircuitA/peerings/AzurePrivatePeering/connections/circuitConnectionUSAUS",
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
         "name": "circuitConnectionUSAUS",
         "properties": {
-          "expressroutecircuitpeering": {
-            "id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
+          "expressRouteCircuitPeering": {
+            "id": "/subscriptions/subid1/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
           },
-          "peerexpressroutecircuitpeering": {
-            "id": "/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
+          "peerExpressRouteCircuitPeering": {
+            "id": "/subscriptions/subid2/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
           },
           "authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
           "addressPrefix": "10.0.0.0/24",
-          "circuitConnectionStatus": "Connected"
+          "circuitConnectionStatus": "Connected",
+          "provisioningState":"Succeeded"
         }
       }
     }

diff --git a/...ion/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCircuit.json b/...ion/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCircuit.json
@@ -1462,11 +1462,11 @@
     },
     "ExpressRouteCircuitConnectionPropertiesFormat": {
       "properties": {
-        "expressroutecircuitpeering": {
+        "expressRouteCircuitPeering": {
           "$ref": "#/definitions/ExpressRouteCircuitPeering",
           "description": "Reference to Express Route Circuit Private Peering Resource of the circuit initiating connection."
         },
-        "peerexpressroutecircuitpeering": {
+        "peerExpressRouteCircuitPeering": {
           "$ref": "#/definitions/ExpressRouteCircuitPeering",
           "description": "Reference to Express Route Circuit Private Peering Resource of the peered circuit."
         },
@@ -1482,16 +1482,20 @@
           "type": "string",
           "description": "Express Route Circuit Connection State. Possible values are: 'Connected' and 'Disconnected'.",
           "enum": [
-            "Unknown",
             "Connected",
-            "Disconnected",
-            "Degraded"
+            "Connecting",
+            "Disconnected"
           ],
           "readOnly": true,
           "x-ms-enum": {
-            "name": "ConnectionStatus",
+            "name": "circuitConnectionStatus",
             "modelAsString": true
           }
+        },
+        "provisioningState": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Provisioning state of the circuit connection resource. Possible values are: 'Succeded', 'Updating', 'Deleting', and 'Failed'."
         }
       }
     },