Skip to content

Remove duplicate enums from Network specs #5647

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

Merged
dsgouda merged 2 commits into from
Apr 19, 2019
Merged

Remove duplicate enums from Network specs #5647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a9052
Remove duplicate enums
anton-evseev Apr 12, 2019
65603a6
Remove readOnly from references to definitions that are already marke…
anton-evseev Apr 17, 2019
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
60 changes: 20 additions & 40 deletions ...tion/network/resource-manager/Microsoft.Network/stable/2019-02-01/applicationGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,16 +1047,8 @@
"description": "PrivateIPAddress of the network interface IP Configuration."
},
"privateIPAllocationMethod": {
"type": "string",
"description": "PrivateIP allocation method.",
"enum": [
"Static",
"Dynamic"
],
"x-ms-enum": {
"name": "IPAllocationMethod",
"modelAsString": true
}
"$ref": "./network.json#/definitions/IPAllocationMethod",
"description": "The private IP address allocation method."
},
"subnet": {
"$ref": "./network.json#/definitions/SubResource",
Expand Down Expand Up @@ -1212,16 +1204,8 @@
"description": "The destination port on the backend."
},
"protocol": {
"type": "string",
"description": "The protocol used to communicate with the backend. Possible values are 'Http' and 'Https'.",
"enum": [
"Http",
"Https"
],
"x-ms-enum": {
"name": "ApplicationGatewayProtocol",
"modelAsString": true
}
"$ref": "#/definitions/ApplicationGatewayProtocol",
"description": "The protocol used to communicate with the backend."
},
"cookieBasedAffinity": {
"type": "string",
Expand Down Expand Up @@ -1327,16 +1311,8 @@
"description": "Frontend port resource of an application gateway."
},
"protocol": {
"type": "string",
"description": "Protocol of the HTTP listener. Possible values are 'Http' and 'Https'.",
"enum": [
"Http",
"Https"
],
"x-ms-enum": {
"name": "ApplicationGatewayProtocol",
"modelAsString": true
}
"$ref": "#/definitions/ApplicationGatewayProtocol",
"description": "Protocol of the HTTP listener."
},
"hostName": {
"type": "string",
Expand Down Expand Up @@ -1453,16 +1429,8 @@
"ApplicationGatewayProbePropertiesFormat": {
"properties": {
"protocol": {
"type": "string",
"description": "The protocol used for the probe. Possible values are 'Http' and 'Https'.",
"enum": [
"Http",
"Https"
],
"x-ms-enum": {
"name": "ApplicationGatewayProtocol",
"modelAsString": true
}
"$ref": "#/definitions/ApplicationGatewayProtocol",
"description": "The protocol used for the probe."
},
"host": {
"type": "string",
Expand Down Expand Up @@ -2555,6 +2523,18 @@
"name": "ApplicationGatewayRedirectType",
"modelAsString": true
}
},
"ApplicationGatewayProtocol": {
"type": "string",
"description": "Application Gateway protocol.",
"enum": [
"Http",
"Https"
],
"x-ms-enum": {
"name": "ApplicationGatewayProtocol",
"modelAsString": true
}
}
}
}
70 changes: 34 additions & 36 deletions ...ion/network/resource-manager/Microsoft.Network/stable/2019-02-01/expressRouteCircuit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,18 +1751,8 @@
"description": "The authorization key."
},
"circuitConnectionStatus": {
"type": "string",
"description": "Express Route Circuit Connection State. Possible values are: 'Connected' and 'Disconnected'.",
"enum": [
"Connected",
"Connecting",
"Disconnected"
],
"readOnly": true,
"x-ms-enum": {
"name": "CircuitConnectionStatus",
"modelAsString": true
}
"$ref": "#/definitions/CircuitConnectionStatus",
"description": "Express Route Circuit connection state."
},
"provisioningState": {
"type": "string",
Expand Down Expand Up @@ -1827,18 +1817,8 @@
"description": "/29 IP address space to carve out Customer addresses for tunnels."
},
"circuitConnectionStatus": {
"type": "string",
"description": "Express Route Circuit Connection State. Possible values are: 'Connected' and 'Disconnected'.",
"enum": [
"Connected",
"Connecting",
"Disconnected"
],
"readOnly": true,
"x-ms-enum": {
"name": "circuitConnectionStatus",
"modelAsString": true
}
"$ref": "#/definitions/CircuitConnectionStatus",
"description": "Express Route Circuit connection state."
},
"connectionName": {
"type": "string",
Expand Down Expand Up @@ -1960,18 +1940,8 @@
"description": "The CircuitProvisioningState state of the resource."
},
"serviceProviderProvisioningState": {
"type": "string",
"description": "The ServiceProviderProvisioningState state of the resource. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'.",
"enum": [
"NotProvisioned",
"Provisioning",
"Provisioned",
"Deprovisioning"
],
"x-ms-enum": {
"name": "ServiceProviderProvisioningState",
"modelAsString": true
}
"$ref": "#/definitions/ServiceProviderProvisioningState",
"description": "The ServiceProviderProvisioningState state of the resource."
},
"authorizations": {
"type": "array",
Expand Down Expand Up @@ -2258,6 +2228,34 @@
}
},
"description": "Response for the ListExpressRouteServiceProvider API service call."
},
"CircuitConnectionStatus": {
"type": "string",
"readOnly": true,
"description": "Express Route Circuit connection state.",
"enum": [
"Connected",
"Connecting",
"Disconnected"
],
"x-ms-enum": {
"name": "CircuitConnectionStatus",
"modelAsString": true
}
},
"ServiceProviderProvisioningState": {
"type": "string",
"description": "The ServiceProviderProvisioningState state of the resource.",
"enum": [
"NotProvisioned",
"Provisioning",
"Provisioned",
"Deprovisioning"
],
"x-ms-enum": {
"name": "ServiceProviderProvisioningState",
"modelAsString": true
}
}
}
}
14 changes: 2 additions & 12 deletions ...ork/resource-manager/Microsoft.Network/stable/2019-02-01/expressRouteCrossConnection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,18 +756,8 @@
"description": "The ExpressRouteCircuit"
},
"serviceProviderProvisioningState": {
"type": "string",
"description": "The provisioning state of the circuit in the connectivity provider system. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned'.",
"enum": [
"NotProvisioned",
"Provisioning",
"Provisioned",
"Deprovisioning"
],
"x-ms-enum": {
"name": "ServiceProviderProvisioningState",
"modelAsString": true
}
"$ref": "./expressRouteCircuit.json#/definitions/ServiceProviderProvisioningState",
"description": "The provisioning state of the circuit in the connectivity provider system."
},
"serviceProviderNotes": {
"type": "string",
Expand Down
30 changes: 4 additions & 26 deletions ...ion/network/resource-manager/Microsoft.Network/stable/2019-02-01/expressRouteGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,19 +536,8 @@
}
},
"provisioningState": {
"type": "string",
"readOnly": true,
"description": "The provisioning state of the resource.",
"enum": [
"Succeeded",
"Updating",
"Deleting",
"Failed"
],
"x-ms-enum": {
"name": "ProvisioningState",
"modelAsString": true
}
"$ref": "./network.json#/definitions/ProvisioningState",
"description": "The provisioning state of the resource."
},
"virtualHub": {
"$ref": "#/definitions/VirtualHubId",
Expand Down Expand Up @@ -595,19 +584,8 @@
],
"properties": {
"provisioningState": {
"type": "string",
"readOnly": true,
"description": "The provisioning state of the resource.",
"enum": [
"Succeeded",
"Updating",
"Deleting",
"Failed"
],
"x-ms-enum": {
"name": "ProvisioningState",
"modelAsString": true
}
"$ref": "./network.json#/definitions/ProvisioningState",
"description": "The provisioning state of the resource."
},
"expressRouteCircuitPeering": {
"$ref": "#/definitions/ExpressRouteCircuitPeeringId",
Expand Down
12 changes: 2 additions & 10 deletions specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/loadBalancer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,16 +1105,8 @@
"description": "The private IP address of the IP configuration."
},
"privateIPAllocationMethod": {
"type": "string",
"description": "The Private IP allocation method. Possible values are: 'Static' and 'Dynamic'.",
"enum": [
"Static",
"Dynamic"
],
"x-ms-enum": {
"name": "IPAllocationMethod",
"modelAsString": true
}
"$ref": "./network.json#/definitions/IPAllocationMethod",
"description": "The Private IP allocation method."
},
"subnet": {
"$ref": "./virtualNetwork.json#/definitions/Subnet",
Expand Down
48 changes: 48 additions & 0 deletions specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/network.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,54 @@
"name":"ProvisioningState",
"modelAsString":true
}
},
"Access": {
"type": "string",
"description": "Access to be allowed or denied.",
"enum": [
"Allow",
"Deny"
],
"x-ms-enum": {
"name": "Access",
"modelAsString": true
}
},
"AuthenticationMethod": {
"type": "string",
"description": "VPN client authentication method.",
"enum": [
"EAPTLS",
"EAPMSCHAPv2"
],
"x-ms-enum": {
"name": "AuthenticationMethod",
"modelAsString": true
}
},
"IPAllocationMethod": {
"type": "string",
"description": "IP address allocation method.",
"enum": [
"Static",
"Dynamic"
],
"x-ms-enum": {
"name": "IPAllocationMethod",
"modelAsString": true
}
},
"IPVersion": {
"type": "string",
"description": "IP address version.",
"enum": [
"IPv4",
"IPv6"
],
"x-ms-enum": {
"name": "IPVersion",
"modelAsString": true
}
}
},
"parameters": {
Expand Down
Loading