diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherAvailableProvidersListGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherAvailableProvidersListGet.json index 61198b394290..d825e05eafd2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherAvailableProvidersListGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherAvailableProvidersListGet.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version" : "2017-08-01", + "api-version" : "2018-01-01", "subscriptionId" : "subid", "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherAzureReachabilityReportGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherAzureReachabilityReportGet.json index dca51d710b16..a747ba7bd58b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherAzureReachabilityReportGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherAzureReachabilityReportGet.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version" : "2017-08-01", + "api-version" : "2018-01-01", "subscriptionId" : "subid", "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectionMonitorCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectionMonitorCreate.json index 365ffe4e9a89..d15d6cc4f9f9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectionMonitorCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectionMonitorCreate.json @@ -15,7 +15,7 @@ "address": "bing.com", "port": 80 }, - "MonitoringIntervalInSeconds": 60 + "monitoringIntervalInSeconds": 60 } } }, @@ -42,6 +42,29 @@ "location": "centraluseuap", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } + }, + "200" : { + "body" : { + "name" : "cm1", + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1", + "etag" : "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"", + "properties" : { + "provisioningState": "Updating", + "source": { + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", + "port": 0 + }, + "destination": { + "address": "bing.com", + "port": 80 + }, + "monitoringIntervalInSeconds": 60, + "autoStart": true, + "monitoringStatus": "NotStarted" + }, + "location": "centraluseuap", + "type": "Microsoft.Network/networkWatchers/connectionMonitors" + } } } } \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectionMonitorDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectionMonitorDelete.json new file mode 100644 index 000000000000..9919516c03ce --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectionMonitorDelete.json @@ -0,0 +1,13 @@ +{ + "parameters" : { + "api-version" : "2018-01-01", + "subscriptionId" : "subid", + "resourceGroupName" : "rg1", + "networkWatcherName" : "nw1", + "connectionMonitorName" : "cm1" + }, + "responses" : { + "204" : {}, + "202" : {} + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectivityCheck.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectivityCheck.json index 37e4e01358c4..837565dd4fb3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectivityCheck.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherConnectivityCheck.json @@ -5,14 +5,12 @@ "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", "parameters" : { - "properties" : { - "source" : { - "resourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1" - }, - "destination" : { - "address" : "192.168.100.4", - "port" : "3389" - } + "source" : { + "resourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1" + }, + "destination" : { + "address" : "192.168.100.4", + "port" : 3389 } } }, @@ -78,4 +76,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherCreate.json index 154a680a8f6f..ae18ddba8d2b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherCreate.json @@ -4,21 +4,18 @@ "subscriptionId" : "subid", "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", - "parameters" : { - "properties" : { - "location" : "eastus" - } - } + "parameters": { + "location": "eastus" + } }, "responses" : { "200" : { "body" : { - "name" : "nw1", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1", - "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", + "name" : "nw1", "type" : "Microsoft.Network/networkWatchers", "location" : "eastus", - "tags" : [], + "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", "properties" : { "provisioningState" : "Succeeded" } @@ -26,12 +23,11 @@ }, "201" : { "body" : { - "name" : "nw1", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1", - "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", + "name" : "nw1", "type" : "Microsoft.Network/networkWatchers", "location" : "eastus", - "tags" : [], + "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", "properties" : { "provisioningState" : "Succeeded" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherFlowLogConfigure.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherFlowLogConfigure.json index 7e3dd24fd150..edd79d856e50 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherFlowLogConfigure.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherFlowLogConfigure.json @@ -5,12 +5,10 @@ "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", "parameters" : { + "targetResourceId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1", "properties" : { - "targetResourceId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1", - "properties" : { - "storageId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", - "enabled" : true - } + "storageId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", + "enabled" : true } } }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherFlowLogStatusQuery.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherFlowLogStatusQuery.json index 9b5b6bfec91b..484d19c01bda 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherFlowLogStatusQuery.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherFlowLogStatusQuery.json @@ -5,9 +5,7 @@ "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", "parameters" : { - "properties" : { - "targetResourceId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1" - } + "targetResourceId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1" } }, "responses" : { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherGet.json index 2016d3f5ce35..953373d6c432 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherGet.json @@ -8,12 +8,11 @@ "responses" : { "200" : { "body" : { - "name" : "nw1", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1", - "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", + "name" : "nw1", "type" : "Microsoft.Network/networkWatchers", "location" : "eastus", - "tags" : [], + "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", "properties" : { "provisioningState" : "Succeeded" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherIpFlowVerify.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherIpFlowVerify.json index b6357c475ce0..551fba454393 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherIpFlowVerify.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherIpFlowVerify.json @@ -5,15 +5,13 @@ "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", "parameters" : { - "properties" : { - "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", - "direction" : "Outbound", - "protocol" : "TCP", - "localPort" : "80", - "remotePort" : "80", - "localIPAddress" : "10.2.0.4", - "remoteIPAddress" : "121.10.1.1" - } + "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", + "direction" : "Outbound", + "protocol" : "TCP", + "localPort" : "80", + "remotePort" : "80", + "localIPAddress" : "10.2.0.4", + "remoteIPAddress" : "121.10.1.1" } }, "responses" : { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherList.json index 94266d96cf34..bb74f91f3b7c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherList.json @@ -9,23 +9,21 @@ "body" : { "value" : [ { - "name" : "nw1", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1", - "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", + "name" : "nw1", "type" : "Microsoft.Network/networkWatchers", "location" : "eastus", - "tags" : [], + "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", "properties" : { "provisioningState" : "Succeeded" } }, { - "name" : "nw2", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw2", - "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", + "name" : "nw2", "type" : "Microsoft.Network/networkWatchers", "location" : "eastus", - "tags" : [], + "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", "properties" : { "provisioningState" : "Succeeded" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherListAll.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherListAll.json index e10a6f796ca9..74c5ee516ec2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherListAll.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherListAll.json @@ -8,23 +8,21 @@ "body" : { "value" : [ { - "name" : "nw1", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1", - "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", + "name" : "nw1", "type" : "Microsoft.Network/networkWatchers", "location" : "eastus", - "tags" : [], + "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", "properties" : { "provisioningState" : "Succeeded" } }, { - "name" : "nw2", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw2", - "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", + "name" : "nw2", "type" : "Microsoft.Network/networkWatchers", - "location" : "westus", - "tags" : [], + "location" : "eastus", + "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", "properties" : { "provisioningState" : "Succeeded" } @@ -33,4 +31,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherNextHopGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherNextHopGet.json index d330c933fd70..8bd8aa44b89d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherNextHopGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherNextHopGet.json @@ -5,12 +5,10 @@ "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", "parameters" : { - "properties" : { - "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", - "sourcIPAddress" : "10.0.0.5", - "destinationIPAddress" : "10.0.0.10", - "targetNicResourceId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/nic1" - } + "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", + "sourceIPAddress" : "10.0.0.5", + "destinationIPAddress" : "10.0.0.10", + "targetNicResourceId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/nic1" } }, "responses" : { @@ -29,4 +27,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureCreate.json index 8e14c2555471..2dc2771ec7d7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureCreate.json @@ -8,15 +8,15 @@ "parameters" : { "properties" : { "target" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", - "bytesToCapturePerPacket" : "10000", - "totalBytesPerSession" : "100000", - "timeLimitInSeconds" : "100", + "bytesToCapturePerPacket" : 10000, + "totalBytesPerSession" : 100000, + "timeLimitInSeconds" : 100, "storageLocation" : { "storageId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/pcstore", "storagePath" : "https://mytestaccountname.blob.core.windows.net/capture/pc1.cap", "filePath" : "D:\\capture\\pc1.cap" }, - "filters" : [ + "filters" : [ { "protocol" : "TCP", "localIPAddress" : "10.0.0.4", @@ -31,12 +31,12 @@ "body" : { "name" : "pc1", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/packetCaptures/pc1", + "etag": "W/\"a3a2b157-1edc-44c2-a759-f881be9f0069\"", "properties" : { - "provisioningState" : "Updating", "target" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", - "bytesToCapturePerPacket" : "10000", - "totalBytesPerSession" : "100000", - "timeLimitInSeconds" : "100", + "bytesToCapturePerPacket" : 10000, + "totalBytesPerSession" : 100000, + "timeLimitInSeconds" : 100, "storageLocation" : { "storageId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/pcstore", "storagePath" : "https://mytestaccountname.blob.core.windows.net/capture/pc1.cap", @@ -48,9 +48,10 @@ "localIPAddress" : "10.0.0.4", "localPort" : "80" } - ] + ], + "provisioningState" : "Updating" } } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureGet.json index 7b93b9156d74..cabdd75e8a21 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureGet.json @@ -13,11 +13,10 @@ "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/packetCaptures/pc1", "etag" : "W/\"00000000-0000-0000-0000-000000000000\"", "properties" : { - "provisioningState" : "Updating", "target" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", - "bytesToCapturePerPacket" : "10000", - "totalBytesPerSession" : "100000", - "timeLimitInSeconds" : "100", + "bytesToCapturePerPacket" : 10000, + "totalBytesPerSession" : 100000, + "timeLimitInSeconds" : 100, "storageLocation" : { "storageId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/pcstore", "storagePath" : "https://mytestaccountname.blob.core.windows.net/capture/pc1.cap", @@ -29,7 +28,8 @@ "localIPAddress" : "10.0.0.4", "localPort" : "80" } - ] + ], + "provisioningState" : "Updating" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureQueryStatus.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureQueryStatus.json index 4e2fb2689a23..4d2e30da93aa 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureQueryStatus.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCaptureQueryStatus.json @@ -11,7 +11,7 @@ "body" : { "name" : "pc1", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/packetCaptures/pc1", - "captureStartTime" : "9/7/2016 12:35:24PM", + "captureStartTime" : "2016-01-08T03:42:33.3387305Z", "packetCaptureStatus" : "Stopped", "stopReason" : "TimeExceeded", "packetCaptureError" : [] @@ -21,11 +21,11 @@ "body" : { "name" : "pc1", "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/packetCaptures/pc1", - "captureStartTime" : "9/7/2016 12:35:24PM", + "captureStartTime" : "2016-01-08T03:42:33.3387305Z", "packetCaptureStatus" : "Stopped", "stopReason" : "TimeExceeded", "packetCaptureError" : [] } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCapturesList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCapturesList.json index e58c334eabc0..cc2f29d643a1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCapturesList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherPacketCapturesList.json @@ -16,9 +16,9 @@ "properties" : { "provisioningState" : "Updating", "target" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", - "bytesToCapturePerPacket" : "10000", - "totalBytesPerSession" : "100000", - "timeLimitInSeconds" : "100", + "bytesToCapturePerPacket" : 10000, + "totalBytesPerSession" : 100000, + "timeLimitInSeconds" : 100, "storageLocation" : { "storageId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/pcstore", "storagePath" : "https://mytestaccountname.blob.core.windows.net/capture/pc1.cap", @@ -40,9 +40,9 @@ "properties" : { "provisioningState" : "Succeeded", "target" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", - "bytesToCapturePerPacket" : "10000", - "totalBytesPerSession" : "100000", - "timeLimitInSeconds" : "100", + "bytesToCapturePerPacket" : 10000, + "totalBytesPerSession" : 100000, + "timeLimitInSeconds" : 100, "storageLocation" : { "storageId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/pcstore", "storagePath" : "https://mytestaccountname.blob.core.windows.net/capture/pc2.cap", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherSecurityGroupViewGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherSecurityGroupViewGet.json index 1f33c806852e..e546157f65d8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherSecurityGroupViewGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherSecurityGroupViewGet.json @@ -5,9 +5,7 @@ "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", "parameters" : { - "properties" : { - "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1" - } + "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1" } }, "responses" : { @@ -17,6 +15,31 @@ { "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkInterfaces/nic1", "securityRuleAssociations" : { + "networkInterfaceAssociation": { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkInterfaces/nic1", + "securityRules": [ + { + "name": "default-allow-rdp", + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkSecurityGroups/nsg1/securityRules/default-allow-rdp", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "protocol": "Tcp", + "sourcePortRange": "*", + "destinationPortRange": "3389", + "sourceAddressPrefix": "*", + "destinationAddressPrefix": "*", + "access": "Allow", + "priority": 1000, + "direction": "Inbound", + "sourcePortRanges": [], + "destinationPortRanges": [], + "sourceAddressPrefixes": [], + "destinationAddressPrefixes": [] + } + } + ] + }, "subnetAssociation" : { "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1", "securityRules" : [ @@ -37,39 +60,39 @@ "direction" : "Inbound" } } - ], - "defaultSecurityRules" : [ - { - "name" : "AllowVnetInBound", - "id" : "/subscriptions//resourceGroups//providers/Microsoft.Network/networkSecurityGroups//defaultSecurityRules/", - "properties" : { - "provisioningState" : "Succeeded", - "description" : "Allow inbound traffic from all VMs in VNET", - "protocol" : "*", - "sourcePortRange" : "*", - "destinationPortRange" : "*", - "sourceAddressPrefix" : "VirtualNetwork", - "destinationAddressPrefix" : "VirtualNetwork", - "access" : "Allow", - "priority" : 65000, - "direction" : "Inbound" - } + ] + }, + "defaultSecurityRules" : [ + { + "name" : "AllowVnetInBound", + "id" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkSecurityGroups/nsg1/defaultSecurityRules/", + "properties" : { + "provisioningState" : "Succeeded", + "description" : "Allow inbound traffic from all VMs in VNET", + "protocol" : "*", + "sourcePortRange" : "*", + "destinationPortRange" : "*", + "sourceAddressPrefix" : "VirtualNetwork", + "destinationAddressPrefix" : "VirtualNetwork", + "access" : "Allow", + "priority" : 65000, + "direction" : "Inbound" } - ], - "effectiveSecurityRules" : [ - { - "name" : "DefaultOutboundDenyAll", - "protocol" : "All", - "sourcePortRange" : "0-65535", - "destinationPortRange" : "0-65535", - "sourceAddressPrefix" : "*", - "destinationAddressPrefix" : "*", - "access" : "Deny", - "priority" : 65500, - "direction" : "Outbound" - } - ] - } + } + ], + "effectiveSecurityRules" : [ + { + "name" : "DefaultOutboundDenyAll", + "protocol" : "All", + "sourcePortRange" : "0-65535", + "destinationPortRange" : "0-65535", + "sourceAddressPrefix" : "*", + "destinationAddressPrefix" : "*", + "access" : "Deny", + "priority" : 65500, + "direction" : "Outbound" + } + ] } } ] @@ -77,12 +100,37 @@ }, "202" : { "body" : { - "networkInterfaces": [ + "networkInterfaces" : [ { - "id" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkInterfaces/nic1", + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkInterfaces/nic1", "securityRuleAssociations" : { + "networkInterfaceAssociation": { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkInterfaces/nic1", + "securityRules": [ + { + "name": "default-allow-rdp", + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkSecurityGroups/nsg1/securityRules/default-allow-rdp", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "protocol": "Tcp", + "sourcePortRange": "*", + "destinationPortRange": "3389", + "sourceAddressPrefix": "*", + "destinationAddressPrefix": "*", + "access": "Allow", + "priority": 1000, + "direction": "Inbound", + "sourcePortRanges": [], + "destinationPortRanges": [], + "sourceAddressPrefixes": [], + "destinationAddressPrefixes": [] + } + } + ] + }, "subnetAssociation" : { - "id" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1", + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1", "securityRules" : [ { "name" : "fe_rule", @@ -101,43 +149,43 @@ "direction" : "Inbound" } } - ], - "defaultSecurityRules" : [ - { - "name" : "AllowVnetInBound", - "id" : "/subscriptions//resourceGroups//providers/Microsoft.Network/networkSecurityGroups//defaultSecurityRules/", - "properties" : { - "provisioningState" : "Succeeded", - "description" : "Allow inbound traffic from all VMs in VNET", - "protocol" : "*", - "sourcePortRange" : "*", - "destinationPortRange" : "*", - "sourceAddressPrefix" : "VirtualNetwork", - "destinationAddressPrefix" : "VirtualNetwork", - "access" : "Allow", - "priority" : 65000, - "direction" : "Inbound" - } - } - ], - "effectiveSecurityRules" : [ - { - "name" : "DefaultOutboundDenyAll", - "protocol" : "All", - "sourcePortRange" : "0-65535", - "destinationPortRange" : "0-65535", - "sourceAddressPrefix" : "*", - "destinationAddressPrefix" : "*", - "access" : "Deny", - "priority" : 65500, - "direction" : "Outbound" + ] + }, + "defaultSecurityRules" : [ + { + "name" : "AllowVnetInBound", + "id" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkSecurityGroups/nsg1/defaultSecurityRules/", + "properties" : { + "provisioningState" : "Succeeded", + "description" : "Allow inbound traffic from all VMs in VNET", + "protocol" : "*", + "sourcePortRange" : "*", + "destinationPortRange" : "*", + "sourceAddressPrefix" : "VirtualNetwork", + "destinationAddressPrefix" : "VirtualNetwork", + "access" : "Allow", + "priority" : 65000, + "direction" : "Inbound" } - ] - } + } + ], + "effectiveSecurityRules" : [ + { + "name" : "DefaultOutboundDenyAll", + "protocol" : "All", + "sourcePortRange" : "0-65535", + "destinationPortRange" : "0-65535", + "sourceAddressPrefix" : "*", + "destinationAddressPrefix" : "*", + "access" : "Deny", + "priority" : 65500, + "direction" : "Outbound" + } + ] } } ] } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherTroubleshootGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherTroubleshootGet.json index f38b32992cd1..5fdf40d671d3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherTroubleshootGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherTroubleshootGet.json @@ -5,12 +5,10 @@ "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", "parameters" : { + "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", "properties" : { - "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1", - "properties" : { - "storageId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", - "storagePath" : "https://st1.blob.core.windows.net/cn1" - } + "storageId" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", + "storagePath" : "https://st1.blob.core.windows.net/cn1" } } }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherTroubleshootResultQuery.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherTroubleshootResultQuery.json index 0c31177466bf..0ff9d26fd1d1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherTroubleshootResultQuery.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/NetworkWatcherTroubleshootResultQuery.json @@ -5,9 +5,7 @@ "resourceGroupName" : "rg1", "networkWatcherName" : "nw1", "parameters" : { - "properties" : { - "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1" - } + "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1" } }, "responses" : { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/networkWatcher.json index e091c50818a3..cc3aa43063e5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/networkWatcher.json @@ -87,6 +87,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Create network watcher": { "$ref": "./examples/NetworkWatcherCreate.json" } } }, "get": { @@ -124,6 +127,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Get network watcher": { "$ref": "./examples/NetworkWatcherGet.json" } } }, "delete": { @@ -162,6 +168,9 @@ "204": { "description": "Delete successful." } + }, + "x-ms-examples": { + "Delete network watcher": { "$ref": "./examples/NetworkWatcherDelete.json" } } }, "patch": { @@ -246,6 +255,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List network watchers": { "$ref": "./examples/NetworkWatcherList.json" } } } }, @@ -274,6 +286,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List all network watchers": { "$ref": "./examples/NetworkWatcherListAll.json" } } } }, @@ -382,6 +397,9 @@ "$ref": "#/definitions/VerificationIPFlowResult" } } + }, + "x-ms-examples": { + "Ip flow verify": { "$ref": "./examples/NetworkWatcherIpFlowVerify.json" } } } }, @@ -437,6 +455,9 @@ "$ref": "#/definitions/NextHopResult" } } + }, + "x-ms-examples": { + "Get next hop": { "$ref": "./examples/NetworkWatcherNextHopGet.json" } } } }, @@ -492,6 +513,9 @@ "$ref": "#/definitions/SecurityGroupViewResult" } } + }, + "x-ms-examples": { + "Get security group view": { "$ref": "./examples/NetworkWatcherSecurityGroupViewGet.json" } } } }, @@ -548,6 +572,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Create packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureCreate.json" } } }, "get": { @@ -592,6 +619,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Get packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureGet.json" } } }, "delete": { @@ -637,6 +667,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Delete packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureDelete.json" } } } }, @@ -684,6 +717,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Stop packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureStop.json" } } } }, @@ -737,6 +773,9 @@ "$ref": "#/definitions/PacketCaptureQueryStatusResult" } } + }, + "x-ms-examples": { + "Query packet capture status": { "$ref": "./examples/NetworkWatcherPacketCaptureQueryStatus.json" } } } }, @@ -779,6 +818,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List packet captures": { "$ref": "./examples/NetworkWatcherPacketCapturesList.json" } } } }, @@ -834,6 +876,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get troubleshooting": { "$ref": "./examples/NetworkWatcherTroubleshootGet.json" } } } }, @@ -889,6 +934,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get troubleshoot result": { "$ref": "./examples/NetworkWatcherTroubleshootResultQuery.json" } } } }, @@ -944,6 +992,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Configure flow log": { "$ref": "./examples/NetworkWatcherFlowLogConfigure.json" } } } }, @@ -999,6 +1050,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Get flow log status": { "$ref": "./examples/NetworkWatcherFlowLogStatusQuery.json" } } } }, @@ -1054,6 +1108,9 @@ "$ref": "#/definitions/ConnectivityInformation" } } + }, + "x-ms-examples": { + "Check connectivity": { "$ref": "./examples/NetworkWatcherConnectivityCheck.json" } } } }, @@ -1225,17 +1282,20 @@ ], "responses": { "200": { - "description": "Update successful. The operation returns the resulting network watcher resource.", + "description": "Update successful. The operation returns the resulting connection monitor resource.", "schema": { "$ref": "#/definitions/ConnectionMonitorResult" } }, "201": { - "description": "Create successful. The operation returns the resulting network watcher resource.", + "description": "Create successful. The operation returns the resulting connection monitor resource.", "schema": { "$ref": "#/definitions/ConnectionMonitorResult" } } + }, + "x-ms-examples": { + "Create connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorCreate.json" } } }, "get": { @@ -1280,6 +1340,9 @@ "$ref": "#/definitions/ConnectionMonitorResult" } } + }, + "x-ms-examples": { + "Get connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorGet.json" } } }, "delete": { @@ -1325,6 +1388,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Delete connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorDelete.json" } } } }, @@ -1372,6 +1438,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Stop connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorStop.json" } } } }, @@ -1419,6 +1488,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Start connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorStart.json" } } } }, @@ -1472,6 +1544,9 @@ "$ref": "#/definitions/ConnectionMonitorQueryResult" } } + }, + "x-ms-examples": { + "Query connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorQuery.json" } } } }, @@ -1514,6 +1589,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List connection monitors": { "$ref": "./examples/NetworkWatcherConnectionMonitorList.json" } } } } @@ -1521,9 +1599,24 @@ "definitions": { "NetworkWatcher": { "properties": { + "name": { + "readOnly": true, + "type": "string", + "description": "Name of the network watcher." + }, + "id": { + "readOnly": true, + "type": "string", + "description": "ID of the network watcher." + }, "etag": { "type": "string", - "description": "A unique read-only string that changes whenever the resource is updated." + "default": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Network watcher type." }, "properties": { "x-ms-client-flatten": true, @@ -1535,6 +1628,9 @@ "$ref": "./network.json#/definitions/Resource" } ], + "required": [ + "location" + ], "description": "Network watcher in a resource group." }, "NetworkWatcherPropertiesFormat": { @@ -1897,6 +1993,21 @@ }, "PacketCapture": { "properties": { + "name": { + "readOnly": true, + "type": "string", + "description": "Name of the packet capture." + }, + "id": { + "readOnly": true, + "type": "string", + "description": "ID of the packet capture." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Packet capture type." + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/PacketCaptureParameters" @@ -2013,12 +2124,17 @@ "name": { "readOnly": true, "type": "string", - "description": "Name of the packet capture session." + "description": "Name of the packet capture." }, "id": { "readOnly": true, "type": "string", - "description": "ID of the packet capture operation." + "description": "ID of the packet capture." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Packet capture type." }, "etag": { "type": "string",