From 7f6a6ebb16087493826efbee698e9c1464d717b3 Mon Sep 17 00:00:00 2001 From: Satyaanshu Date: Thu, 24 Mar 2022 14:10:38 +0530 Subject: [PATCH 1/6] Added flush conn to nsg --- .../2021-08-01/examples/NetworkSecurityGroupCreate.json | 2 ++ .../stable/2021-08-01/networkSecurityGroup.json | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/NetworkSecurityGroupCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/NetworkSecurityGroupCreate.json index cfae98f8933a..e554351db3e2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/NetworkSecurityGroupCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/NetworkSecurityGroupCreate.json @@ -17,6 +17,7 @@ "location": "eastus", "properties": { "provisioningState": "Succeeded", + "flushConnection": false, "securityRules": [], "defaultSecurityRules": [ { @@ -127,6 +128,7 @@ "location": "eastus", "properties": { "provisioningState": "Succeeded", + "flushConnection": false, "securityRules": [], "defaultSecurityRules": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json index 10909e8cb774..78f0b66dccdd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json @@ -738,6 +738,10 @@ "modelAsString": true } }, + "flushConnection": { + "type": "boolean", + "description": "Specifies whether to flush network security group connection." + }, "sourcePortRange": { "type": "string", "description": "The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports." From eb1c5ad2eb23d4d3f3747c747f43d0f88d7b7a4f Mon Sep 17 00:00:00 2001 From: Satyaanshu Date: Thu, 24 Mar 2022 14:40:04 +0530 Subject: [PATCH 2/6] Updated flushConn to correct location --- .../stable/2021-08-01/networkSecurityGroup.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json index 78f0b66dccdd..7769760d03fc 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json @@ -738,10 +738,6 @@ "modelAsString": true } }, - "flushConnection": { - "type": "boolean", - "description": "Specifies whether to flush network security group connection." - }, "sourcePortRange": { "type": "string", "description": "The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports." @@ -874,6 +870,19 @@ }, "NetworkSecurityGroupPropertiesFormat": { "properties": { + "flushConnection": { + "type": "string", + "description": "Specifies whether to flush network security group connection.", + "enum": [ + "true", + "false", + "null" + ], + "x-ms-enum": { + "name": "FlushConnection", + "modelAsString": true + } + }, "securityRules": { "type": "array", "items": { From 5b0f22469329431c84c8a2424ff61138cda2fd65 Mon Sep 17 00:00:00 2001 From: Satyaanshu Date: Thu, 24 Mar 2022 22:28:20 +0530 Subject: [PATCH 3/6] Updated description --- .../stable/2021-08-01/networkSecurityGroup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json index 7769760d03fc..3f69bc66d53e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json @@ -872,7 +872,7 @@ "properties": { "flushConnection": { "type": "string", - "description": "Specifies whether to flush network security group connection.", + "description": "When enabled, flows created from Network Security Group connections will be re-evaluated when rules are updates. Initial enablement will trigger re-evaluation.", "enum": [ "true", "false", From 33811d770ab2e8b9f87afe3d458da30cabddca1a Mon Sep 17 00:00:00 2001 From: Satyaanshu Date: Fri, 25 Mar 2022 00:38:33 +0530 Subject: [PATCH 4/6] Modified T/F to Enabled/Disabled --- .../stable/2021-08-01/networkSecurityGroup.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json index 3f69bc66d53e..5a8d0952bba8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json @@ -874,8 +874,8 @@ "type": "string", "description": "When enabled, flows created from Network Security Group connections will be re-evaluated when rules are updates. Initial enablement will trigger re-evaluation.", "enum": [ - "true", - "false", + "Enabled", + "Disabled", "null" ], "x-ms-enum": { From 31ff26ab67bf4049c413f2ba59f8c7e6115f9597 Mon Sep 17 00:00:00 2001 From: Satyaanshu Date: Fri, 25 Mar 2022 11:05:18 +0530 Subject: [PATCH 5/6] Refactoring so that null value appears first --- .../stable/2021-08-01/networkSecurityGroup.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json index 5a8d0952bba8..cfd288999537 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json @@ -874,9 +874,9 @@ "type": "string", "description": "When enabled, flows created from Network Security Group connections will be re-evaluated when rules are updates. Initial enablement will trigger re-evaluation.", "enum": [ + "null", "Enabled", - "Disabled", - "null" + "Disabled" ], "x-ms-enum": { "name": "FlushConnection", From 71ac75c3dce15a48de20e0fb4328ef561e15a942 Mon Sep 17 00:00:00 2001 From: Satyaanshu Date: Sat, 26 Mar 2022 01:11:05 +0530 Subject: [PATCH 6/6] Reverted FlushConnection to boolean value instead of string --- .../stable/2021-08-01/networkSecurityGroup.json | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json index cfd288999537..7f2b525a6edd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/networkSecurityGroup.json @@ -871,17 +871,8 @@ "NetworkSecurityGroupPropertiesFormat": { "properties": { "flushConnection": { - "type": "string", - "description": "When enabled, flows created from Network Security Group connections will be re-evaluated when rules are updates. Initial enablement will trigger re-evaluation.", - "enum": [ - "null", - "Enabled", - "Disabled" - ], - "x-ms-enum": { - "name": "FlushConnection", - "modelAsString": true - } + "type": "boolean", + "description": "When enabled, flows created from Network Security Group connections will be re-evaluated when rules are updates. Initial enablement will trigger re-evaluation." }, "securityRules": { "type": "array",