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

Resolve issue with unreferenced examples in Network specs for older API versions #5675

Merged
merged 2 commits into from
Apr 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "eastus",
"sku": {
"name": "Basic"
},
"properties": {
"provisioningState": "Succeeded",
"frontendIPConfigurations": [
Expand Down Expand Up @@ -170,8 +167,7 @@
},
"probe": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb"
},
"disableOutboundSnat": false
}
}
}
],
Expand Down Expand Up @@ -222,9 +218,6 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "eastus",
"sku": {
"name": "Basic"
},
"properties": {
"provisioningState": "Succeeded",
"frontendIPConfigurations": [
Expand Down Expand Up @@ -286,8 +279,7 @@
},
"probe": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb"
},
"disableOutboundSnat": false
}
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
"resourceGroupName" : "rg1",
"networkWatcherName" : "nw1",
"parameters" : {
"properties" : {
"location" : "eastus"
}
"location" : "eastus",
"properties" : {}
}
},
"responses" : {
Expand All @@ -18,7 +17,7 @@
"etag" : "W/\"00000000-0000-0000-0000-000000000000\"",
"type" : "Microsoft.Network/networkWatchers",
"location" : "eastus",
"tags" : [],
"tags" : {},
"properties" : {
"provisioningState" : "Succeeded"
}
Expand All @@ -31,11 +30,11 @@
"etag" : "W/\"00000000-0000-0000-0000-000000000000\"",
"type" : "Microsoft.Network/networkWatchers",
"location" : "eastus",
"tags" : [],
"tags" : {},
"properties" : {
"provisioningState" : "Succeeded"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
},
Expand All @@ -34,4 +32,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand All @@ -30,4 +28,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"etag" : "W/\"00000000-0000-0000-0000-000000000000\"",
"type" : "Microsoft.Network/networkWatchers",
"location" : "eastus",
"tags" : [],
"tags" : {},
"properties" : {
"provisioningState" : "Succeeded"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand All @@ -30,4 +28,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"etag" : "W/\"00000000-0000-0000-0000-000000000000\"",
"type" : "Microsoft.Network/networkWatchers",
"location" : "eastus",
"tags" : [],
"tags" : {},
"properties" : {
"provisioningState" : "Succeeded"
}
Expand All @@ -25,7 +25,7 @@
"etag" : "W/\"00000000-0000-0000-0000-000000000000\"",
"type" : "Microsoft.Network/networkWatchers",
"location" : "eastus",
"tags" : [],
"tags" : {},
"properties" : {
"provisioningState" : "Succeeded"
}
Expand All @@ -34,4 +34,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"etag" : "W/\"00000000-0000-0000-0000-000000000000\"",
"type" : "Microsoft.Network/networkWatchers",
"location" : "eastus",
"tags" : [],
"tags" : {},
"properties" : {
"provisioningState" : "Succeeded"
}
Expand All @@ -24,7 +24,7 @@
"etag" : "W/\"00000000-0000-0000-0000-000000000000\"",
"type" : "Microsoft.Network/networkWatchers",
"location" : "westus",
"tags" : [],
"tags" : {},
"properties" : {
"provisioningState" : "Succeeded"
}
Expand All @@ -33,4 +33,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand All @@ -29,4 +27,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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" : []
Expand All @@ -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" : []
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand Down Expand Up @@ -37,38 +35,7 @@
"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"
}
]
]
}
}
}
Expand Down Expand Up @@ -101,43 +68,12 @@
"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"
}
]
]
}
}
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"resourceGroupName" : "rg1",
"networkWatcherName" : "nw1",
"parameters" : {
"properties" : {
"targetResourceGroup": "rg2"
}
"targetResourceGroupName": "rg2"
}
},
"responses" : {
Expand Down Expand Up @@ -38,4 +36,4 @@
}
}
}
}
}
Loading