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

Merging July branch, resolved conflicts #3503

Merged
merged 5 commits into from
Jul 25, 2018
Merged

Merging July branch, resolved conflicts #3503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e46c46b
Added api version 2018-06-01 folder (#3342)
MikhailTryakhov Jul 2, 2018
5291131
Refactored parameters definition (#3346)
EvgenyAgafonchikov Jul 5, 2018
aef50b9
Port fixes from 04-01 to 06-01 (#3366)
EvgenyAgafonchikov Jul 11, 2018
8d5cbfd
removed 05-01 folder from local branch (#3501)
MikhailTryakhov Jul 25, 2018
e7c9ce5
Merge branch 'master' into az-Network-July-Release
MikhailTryakhov Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
68 changes: 26 additions & 42 deletions ...tion/network/resource-manager/Microsoft.Network/stable/2018-04-01/applicationGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
"description": "The name of the application gateway."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -108,10 +108,10 @@
"description": "The name of the application gateway."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -159,10 +159,10 @@
"description": "Parameters supplied to the create or update application gateway operation."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -217,10 +217,10 @@
"description": "Parameters supplied to update application gateway tags."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -255,10 +255,10 @@
"description": "The name of the resource group."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -288,10 +288,10 @@
"description": "Gets all the application gateways in a subscription.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -335,10 +335,10 @@
"description": "The name of the application gateway."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -380,10 +380,10 @@
"description": "The name of the application gateway."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -425,10 +425,10 @@
"description": "The name of the application gateway."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
},
{
"name": "$expand",
Expand Down Expand Up @@ -466,10 +466,10 @@
"description": "Lists all available web application firewall rule sets.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand All @@ -496,10 +496,10 @@
"description": "Lists available Ssl options for configuring Ssl policy.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -529,10 +529,10 @@
"description": "Lists all SSL predefined policies for configuring Ssl policy.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand All @@ -559,10 +559,10 @@
"description": "Gets Ssl predefined policy with the specified policy name.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
},
{
"name": "predefinedPolicyName",
Expand Down Expand Up @@ -2118,21 +2118,5 @@
"modelAsString": true
}
}
},
"parameters": {
"SubscriptionIdParameter": {
"name": "subscriptionId",
"in": "path",
"required": true,
"type": "string",
"description": "The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
},
"ApiVersionParameter": {
"name": "api-version",
"in": "query",
"required": true,
"type": "string",
"description": "Client API version."
}
}
}
36 changes: 10 additions & 26 deletions ...etwork/resource-manager/Microsoft.Network/stable/2018-04-01/applicationSecurityGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
"description": "The name of the application security group."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -101,10 +101,10 @@
"description": "The name of the application security group."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -150,10 +150,10 @@
"description": "Parameters supplied to the create or update ApplicationSecurityGroup operation."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -185,10 +185,10 @@
"description": "Gets all application security groups in a subscription.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -223,10 +223,10 @@
"description": "The name of the resource group."
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -299,21 +299,5 @@
},
"description": "A list of application security groups."
}
},
"parameters": {
"SubscriptionIdParameter": {
"name": "subscriptionId",
"in": "path",
"required": true,
"type": "string",
"description": "The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
},
"ApiVersionParameter": {
"name": "api-version",
"in": "query",
"required": true,
"type": "string",
"description": "Client API version."
}
}
}
36 changes: 10 additions & 26 deletions ...ification/network/resource-manager/Microsoft.Network/stable/2018-04-01/azureFirewall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
"description":"The name of the Azure Firewall."
},
{
"$ref":"#/parameters/ApiVersionParameter"
"$ref":"./network.json#/parameters/ApiVersionParameter"
},
{
"$ref":"#/parameters/SubscriptionIdParameter"
"$ref":"./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses":{
Expand Down Expand Up @@ -103,10 +103,10 @@
"description":"The name of the Azure Firewall."
},
{
"$ref":"#/parameters/ApiVersionParameter"
"$ref":"./network.json#/parameters/ApiVersionParameter"
},
{
"$ref":"#/parameters/SubscriptionIdParameter"
"$ref":"./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses":{
Expand Down Expand Up @@ -154,10 +154,10 @@
"description":"Parameters supplied to the create or update Azure Firewall operation."
},
{
"$ref":"#/parameters/ApiVersionParameter"
"$ref":"./network.json#/parameters/ApiVersionParameter"
},
{
"$ref":"#/parameters/SubscriptionIdParameter"
"$ref":"./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses":{
Expand Down Expand Up @@ -198,10 +198,10 @@
"description":"The name of the resource group."
},
{
"$ref":"#/parameters/ApiVersionParameter"
"$ref":"./network.json#/parameters/ApiVersionParameter"
},
{
"$ref":"#/parameters/SubscriptionIdParameter"
"$ref":"./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses":{
Expand Down Expand Up @@ -231,10 +231,10 @@
"description":"Gets all the Azure Firewalls in a subscription.",
"parameters":[
{
"$ref":"#/parameters/ApiVersionParameter"
"$ref":"./network.json#/parameters/ApiVersionParameter"
},
{
"$ref":"#/parameters/SubscriptionIdParameter"
"$ref":"./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses":{
Expand Down Expand Up @@ -628,21 +628,5 @@
"modelAsString":true
}
}
},
"parameters":{
"SubscriptionIdParameter":{
"name":"subscriptionId",
"in":"path",
"required":true,
"type":"string",
"description":"The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
},
"ApiVersionParameter":{
"name":"api-version",
"in":"query",
"required":true,
"type":"string",
"description":"Client API version."
}
}
}
Loading