diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/dscpConfiguration.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/dscpConfiguration.json index 17c2aa4a4c55..bd065ea64fed 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/dscpConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/dscpConfiguration.json @@ -311,9 +311,45 @@ "$ref": "./network.json#/definitions/Resource" } ], - "description": "DSCP Configuration in a resource group." + "description": "Differentiated Services Code Point configuration for any given network interface" }, "DscpConfigurationPropertiesFormat": { + "properties": { + "qosDefinitionCollection": { + "type": "array", + "items": { + "$ref": "#/definitions/QosDefinition" + }, + "description": "QoS object definitions" + }, + "qosCollectionId": { + "type": "string", + "readOnly": true, + "description": "Qos Collection ID generated by RNM." + }, + "associatedNetworkInterfaces": { + "type": "array", + "items": { + "$ref": "./networkInterface.json#/definitions/NetworkInterface" + }, + "readOnly": true, + "description": "Associated Network Interfaces to the DSCP Configuration." + }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resource GUID property of the DSCP Configuration resource." + }, + "provisioningState": { + "readOnly": true, + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the DSCP Configuration resource." + } + }, + "description": "Differentiated Services Code Point configuration properties." + }, + "QosDefinition": { + "type": "object", "properties": { "markings": { "type": "array", @@ -369,32 +405,9 @@ "modelAsString": true }, "description": "RNM supported protocol types." - }, - "qosCollectionId": { - "type": "string", - "readOnly": true, - "description": "Qos Collection ID generated by RNM." - }, - "associatedNetworkInterfaces": { - "type": "array", - "items": { - "$ref": "./networkInterface.json#/definitions/NetworkInterface" - }, - "readOnly": true, - "description": "Associated Network Interfaces to the DSCP Configuration." - }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resource GUID property of the DSCP Configuration resource." - }, - "provisioningState": { - "readOnly": true, - "$ref": "./network.json#/definitions/ProvisioningState", - "description": "The provisioning state of the DSCP Configuration resource." } }, - "description": "DSCP Configuration properties." + "description": "Quality of Service defines the traffic configuration between endpoints. Mandatory to have one marking." }, "QosIpRange": { "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationCreate.json index 006b29798db3..6799ae2e41f6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationCreate.json @@ -6,51 +6,72 @@ "dscpConfigurationName": "mydscpconfig", "parameters": { "properties": { - "markings": [ - 46, - 10 - ], - "sourceIpRanges": [ + "qosDefinitionCollection": [ { - "startIP": "127.0.0.1", - "endIP": "127.0.0.2" + "markings": [ + 1 + ], + "sourceIpRanges": [ + { + "startIP": "127.0.0.1", + "endIP": "127.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "127.0.10.1", + "endIP": "127.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 10, + "end": 11 + }, + { + "start": 20, + "end": 21 + } + ], + "destinationPortRanges": [ + { + "start": 15, + "end": 15 + } + ], + "protocol": "Tcp" }, { - "startIP": "127.0.1.1", - "endIP": "127.0.1.2" + "markings": [ + 2 + ], + "sourceIpRanges": [ + { + "startIP": "12.0.0.1", + "endIP": "12.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "12.0.10.1", + "endIP": "12.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 51, + "end": 52 + } + ], + "protocol": "Udp" } - ], - "destinationIpRanges": [ - { - "startIP": "127.0.10.1", - "endIP": "127.0.10.2" - }, - { - "startIP": "127.0.11.1", - "endIP": "127.0.11.2" - } - ], - "sourcePortRanges": [ - { - "start": 10, - "end": 11 - }, - { - "start": 20, - "end": 21 - } - ], - "destinationPortRanges": [ - { - "start": 15, - "end": 15 - }, - { - "start": 26, - "end": 27 - } - ], - "protocol": "Tcp" + ] }, "location": "eastus" } @@ -63,51 +84,68 @@ "location": "eastus", "properties": { "provisioningState": "Succeeded", - "markings": [ - 46, - 10 - ], - "sourceIpRanges": [ - { - "startIP": "127.0.0.1", - "endIP": "127.0.0.2" - }, - { - "startIP": "127.0.1.1", - "endIP": "127.0.1.2" - } - ], - "destinationIpRanges": [ - { - "startIP": "127.0.10.1", - "endIP": "127.0.10.2" - }, - { - "startIP": "127.0.11.1", - "endIP": "127.0.11.2" - } - ], - "sourcePortRanges": [ - { - "start": 10, - "end": 11 - }, - { - "start": 20, - "end": 21 - } - ], - "destinationPortRanges": [ - { - "start": 15, - "end": 15 + "qosDefinitionCollection": [ + { + "markings": [ + 1 + ], + "sourceIpRanges": [ + { + "startIP": "127.0.0.1", + "endIP": "127.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "127.0.10.1", + "endIP": "127.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 61, + "end": 62 + } + ], + "protocol": "Tcp" }, { - "start": 26, - "end": 27 + "markings": [ + 2 + ], + "sourceIpRanges": [ + { + "startIP": "12.0.0.1", + "endIP": "12.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "12.0.10.1", + "endIP": "12.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 51, + "end": 52 + } + ], + "protocol": "Udp" } ], - "protocol": "Tcp", "associatedNetworkInterfaces": [], "qosCollectionId": "0f8fad5b-d9cb-469f-a165-70867728950e" }, @@ -121,51 +159,68 @@ "location": "eastus", "properties": { "provisioningState": "Succeeded", - "markings": [ - 46, - 10 - ], - "sourceIpRanges": [ - { - "startIP": "127.0.0.1", - "endIP": "127.0.0.2" - }, - { - "startIP": "127.0.1.1", - "endIP": "127.0.1.2" - } - ], - "destinationIpRanges": [ - { - "startIP": "127.0.10.1", - "endIP": "127.0.10.2" - }, - { - "startIP": "127.0.11.1", - "endIP": "127.0.11.2" - } - ], - "sourcePortRanges": [ - { - "start": 10, - "end": 11 - }, - { - "start": 20, - "end": 21 - } - ], - "destinationPortRanges": [ - { - "start": 15, - "end": 15 + "qosDefinitionCollection": [ + { + "markings": [ + 1 + ], + "sourceIpRanges": [ + { + "startIP": "127.0.0.1", + "endIP": "127.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "127.0.10.1", + "endIP": "127.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 61, + "end": 62 + } + ], + "protocol": "Tcp" }, { - "start": 26, - "end": 27 + "markings": [ + 2 + ], + "sourceIpRanges": [ + { + "startIP": "12.0.0.1", + "endIP": "12.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "12.0.10.1", + "endIP": "12.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 51, + "end": 52 + } + ], + "protocol": "Udp" } ], - "protocol": "Tcp", "associatedNetworkInterfaces": [], "qosCollectionId": "0f8fad5b-d9cb-469f-a165-70867728950e" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationGet.json index 95adb97f131f..e28bb79703fd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationGet.json @@ -18,35 +18,68 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/test-nic2" ], "qosCollectionId": "0f8fad5b-d9cb-469f-a165-70867728950e", - "markings": [ - 46, - 10 - ], - "sourceIpRanges": [ - { - "startIP": "127.0.0.1", - "endIP": "127.0.0.2" - } - ], - "destinationIpRanges": [ - { - "startIP": "127.0.10.1", - "endIP": "127.0.10.2" - } - ], - "sourcePortRanges": [ + "qosDefinitionCollection": [ { - "start": 11, - "end": 12 - } - ], - "destinationPortRanges": [ + "markings": [ + 1 + ], + "sourceIpRanges": [ + { + "startIP": "127.0.0.1", + "endIP": "127.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "127.0.10.1", + "endIP": "127.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 61, + "end": 62 + } + ], + "protocol": "Tcp" + }, { - "start": 61, - "end": 62 + "markings": [ + 2 + ], + "sourceIpRanges": [ + { + "startIP": "12.0.0.1", + "endIP": "12.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "12.0.10.1", + "endIP": "12.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 51, + "end": 52 + } + ], + "protocol": "Udp" } - ], - "protocol": "Tcp" + ] }, "type": "Microsoft.Network/dscpConfiguration" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationList.json index 56c9c071d950..7c4982190aec 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationList.json @@ -19,35 +19,68 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/test-nic2" ], "qosCollectionId": "0f8fad5b-d9cb-469f-a165-70867728950e", - "markings": [ - 46, - 10 - ], - "sourceIpRanges": [ - { - "startIP": "127.0.0.1", - "endIP": "127.0.0.2" - } - ], - "destinationIpRanges": [ - { - "startIP": "127.0.10.1", - "endIP": "127.0.10.2" - } - ], - "sourcePortRanges": [ + "qosDefinitionCollection": [ { - "start": 11, - "end": 12 - } - ], - "destinationPortRanges": [ + "markings": [ + 1 + ], + "sourceIpRanges": [ + { + "startIP": "127.0.0.1", + "endIP": "127.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "127.0.10.1", + "endIP": "127.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 61, + "end": 62 + } + ], + "protocol": "Tcp" + }, { - "start": 61, - "end": 62 + "markings": [ + 2 + ], + "sourceIpRanges": [ + { + "startIP": "12.0.0.1", + "endIP": "12.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "12.0.10.1", + "endIP": "12.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 51, + "end": 52 + } + ], + "protocol": "Udp" } - ], - "protocol": "Tcp" + ] }, "type": "Microsoft.Network/dscpConfiguration" }, @@ -62,35 +95,68 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/test-nic4" ], "qosCollectionId": "9as24mf6-d9cb-7a7f-a165-70867728950e", - "markings": [ - 46, - 10 - ], - "sourceIpRanges": [ - { - "startIP": "128.0.0.1", - "endIP": "128.0.0.2" - } - ], - "destinationIpRanges": [ - { - "startIP": "128.0.10.1", - "endIP": "128.0.10.2" - } - ], - "sourcePortRanges": [ + "qosDefinitionCollection": [ { - "start": 11, - "end": 12 - } - ], - "destinationPortRanges": [ + "markings": [ + 1 + ], + "sourceIpRanges": [ + { + "startIP": "127.0.0.1", + "endIP": "127.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "127.0.10.1", + "endIP": "127.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 61, + "end": 62 + } + ], + "protocol": "Tcp" + }, { - "start": 61, - "end": 62 + "markings": [ + 2 + ], + "sourceIpRanges": [ + { + "startIP": "12.0.0.1", + "endIP": "12.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "12.0.10.1", + "endIP": "12.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 51, + "end": 52 + } + ], + "protocol": "Udp" } - ], - "protocol": "Tcp" + ] }, "type": "Microsoft.Network/dscpConfiguration" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationListAll.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationListAll.json index 24579c263013..1b175729b800 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationListAll.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-03-01/examples/DscpConfigurationListAll.json @@ -18,35 +18,68 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/test-nic2" ], "qosCollectionId": "0f8fad5b-d9cb-469f-a165-70867728950e", - "markings": [ - 46, - 10 - ], - "sourceIpRanges": [ - { - "startIP": "127.0.0.1", - "endIP": "127.0.0.2" - } - ], - "destinationIpRanges": [ - { - "startIP": "127.0.10.1", - "endIP": "127.0.10.2" - } - ], - "sourcePortRanges": [ + "qosDefinitionCollection": [ { - "start": 11, - "end": 12 - } - ], - "destinationPortRanges": [ + "markings": [ + 1 + ], + "sourceIpRanges": [ + { + "startIP": "127.0.0.1", + "endIP": "127.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "127.0.10.1", + "endIP": "127.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 61, + "end": 62 + } + ], + "protocol": "Tcp" + }, { - "start": 61, - "end": 62 + "markings": [ + 2 + ], + "sourceIpRanges": [ + { + "startIP": "12.0.0.1", + "endIP": "12.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "12.0.10.1", + "endIP": "12.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 51, + "end": 52 + } + ], + "protocol": "Udp" } - ], - "protocol": "Tcp" + ] }, "type": "Microsoft.Network/dscpConfiguration" }, @@ -61,35 +94,68 @@ "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkInterfaces/test-nic4" ], "qosCollectionId": "9as24mf6-d9cb-7a7f-a165-70867728950e", - "markings": [ - 46, - 10 - ], - "sourceIpRanges": [ - { - "startIP": "128.0.0.1", - "endIP": "128.0.0.2" - } - ], - "destinationIpRanges": [ - { - "startIP": "128.0.10.1", - "endIP": "128.0.10.2" - } - ], - "sourcePortRanges": [ + "qosDefinitionCollection": [ { - "start": 11, - "end": 12 - } - ], - "destinationPortRanges": [ + "markings": [ + 1 + ], + "sourceIpRanges": [ + { + "startIP": "127.0.0.1", + "endIP": "127.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "127.0.10.1", + "endIP": "127.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 61, + "end": 62 + } + ], + "protocol": "Tcp" + }, { - "start": 61, - "end": 62 + "markings": [ + 2 + ], + "sourceIpRanges": [ + { + "startIP": "12.0.0.1", + "endIP": "12.0.0.2" + } + ], + "destinationIpRanges": [ + { + "startIP": "12.0.10.1", + "endIP": "12.0.10.2" + } + ], + "sourcePortRanges": [ + { + "start": 11, + "end": 12 + } + ], + "destinationPortRanges": [ + { + "start": 51, + "end": 52 + } + ], + "protocol": "Udp" } - ], - "protocol": "Tcp" + ] }, "type": "Microsoft.Network/dscpConfiguration" }