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.

Sign up for GitHub

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

Multi QoS support for DSCP configuration #15120

Merged
merged 12 commits into from
Jul 16, 2021
Merged

Multi QoS support for DSCP configuration #15120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2c2363d
Updating the DSCP jsons to reflect the multi-qos support
davelasc Jul 6, 2021
5a07481
Adding support to multi-qos
davelasc Jul 6, 2021
c703977
adding the type object to NrpQos
davelasc Jul 8, 2021
c9a8cd8
fixing the prettier
davelasc Jul 8, 2021
cbfafe9
fixing the missing type object error. seeing if this also fixes the a…
davelasc Jul 14, 2021
1635c70
fixing the prettier exception
davelasc Jul 14, 2021
1855d13
almost forgot this, it was refactor from NrpQos to QosDefinition. NRP…
davelasc Jul 14, 2021
28e20d8
copying what I did with my other objects
davelasc Jul 15, 2021
9c96b00
Merge branch 'network-march-branch' into users/davleasc/9143196_multi…
davelasc Jul 15, 2021
46aa9a6
names didn't match with what I have in NRP's src
davelasc Jul 15, 2021
0bb9b74
forgot to update the examples with the updates in the specification. …
davelasc Jul 15, 2021
190ec39
fixing the merge exceptions
davelasc Jul 15, 2021
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
63 changes: 38 additions & 25 deletions ...ation/network/resource-manager/Microsoft.Network/stable/2021-03-01/dscpConfiguration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
Loading