Skip to content

Commit

Permalink
Merge pull request Azure#1052 from Azure/master
Browse files Browse the repository at this point in the history 
Sync to Master branch
  • Loading branch information
Hovsep committed May 18, 2016
2 parents e23db71 + 92a2f95 commit bc85f48
Show file tree
Hide file tree
Showing 21 changed files with 1,206 additions and 1,176 deletions.
2 changes: 1 addition & 1 deletion ...erators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Batch/Microsoft.Batch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "Microsoft.Batch",
"description": "Microsoft Batch Resource Types",
"resourceDefinitions": {
"Microsoft.Batch_batchAccounts": {
"batchAccounts": {
"type": "object",
"properties": {
"type": {
Expand Down
92 changes: 46 additions & 46 deletions .../Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/CDN/Microsoft.Cdn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "Microsoft.Cdn",
"description": "Microsoft Cdn Resource Types",
"resourceDefinitions": {
"Microsoft.Cdn_profiles": {
"profiles": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -54,7 +54,7 @@
"items": {
"oneOf": [
{
"$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_childResource"
"$ref": "#/definitions/profiles_endpoints_childResource"
}
]
}
Expand All @@ -67,7 +67,7 @@
],
"description": "Microsoft.Cdn/profiles"
},
"Microsoft.Cdn_profiles_endpoints": {
"profiles_endpoints": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -116,10 +116,10 @@
"items": {
"oneOf": [
{
"$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_customDomains_childResource"
"$ref": "#/definitions/profiles_endpoints_customDomains_childResource"
},
{
"$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_origins_childResource"
"$ref": "#/definitions/profiles_endpoints_origins_childResource"
}
]
}
Expand All @@ -132,7 +132,7 @@
],
"description": "Microsoft.Cdn/profiles/endpoints"
},
"Microsoft.Cdn_profiles_endpoints_customDomains": {
"profiles_endpoints_customDomains": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -165,7 +165,7 @@
],
"description": "Microsoft.Cdn/profiles/endpoints/customDomains"
},
"Microsoft.Cdn_profiles_endpoints_origins": {
"profiles_endpoints_origins": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -364,7 +364,41 @@
"origins"
]
},
"Microsoft.Cdn_profiles_endpoints_childResource": {
"OriginPropertiesParameters": {
"type": "object",
"properties": {
"hostName": {
"type": "string",
"description": "The address of the origin. Domain names, IPv4 addresses, and IPv6 addresses are supported."
},
"httpPort": {
"oneOf": [
{
"type": "integer"
},
{
"$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
}
],
"description": "The value of the HTTP port. Must be between 1 and 65535."
},
"httpsPort": {
"oneOf": [
{
"type": "integer"
},
{
"$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
}
],
"description": "The value of the HTTPS port. Must be between 1 and 65535."
}
},
"required": [
"hostName"
]
},
"profiles_endpoints_childResource": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -413,10 +447,10 @@
"items": {
"oneOf": [
{
"$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_customDomains_childResource"
"$ref": "#/definitions/profiles_endpoints_customDomains_childResource"
},
{
"$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_origins_childResource"
"$ref": "#/definitions/profiles_endpoints_origins_childResource"
}
]
}
Expand All @@ -429,7 +463,7 @@
],
"description": "Microsoft.Cdn/profiles/endpoints"
},
"Microsoft.Cdn_profiles_endpoints_customDomains_childResource": {
"profiles_endpoints_customDomains_childResource": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -462,7 +496,7 @@
],
"description": "Microsoft.Cdn/profiles/endpoints/customDomains"
},
"Microsoft.Cdn_profiles_endpoints_origins_childResource": {
"profiles_endpoints_origins_childResource": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -495,40 +529,6 @@
],
"description": "Microsoft.Cdn/profiles/endpoints/origins"
},
"OriginPropertiesParameters": {
"type": "object",
"properties": {
"hostName": {
"type": "string",
"description": "The address of the origin. Domain names, IPv4 addresses, and IPv6 addresses are supported."
},
"httpPort": {
"oneOf": [
{
"type": "integer"
},
{
"$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
}
],
"description": "The value of the HTTP port. Must be between 1 and 65535."
},
"httpsPort": {
"oneOf": [
{
"type": "integer"
},
{
"$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
}
],
"description": "The value of the HTTPS port. Must be between 1 and 65535."
}
},
"required": [
"hostName"
]
},
"Sku": {
"type": "object",
"properties": {
Expand Down
76 changes: 38 additions & 38 deletions ...ors/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Compute/Microsoft.Compute.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "Microsoft.Compute",
"description": "Microsoft Compute Resource Types",
"resourceDefinitions": {
"Microsoft.Compute_availabilitySets": {
"availabilitySets": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -37,7 +37,7 @@
],
"description": "Microsoft.Compute/availabilitySets"
},
"Microsoft.Compute_virtualMachines": {
"virtualMachines": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -79,7 +79,7 @@
"items": {
"oneOf": [
{
"$ref": "#/definitions/Microsoft.Compute_virtualMachines_extensions_childResource"
"$ref": "#/definitions/virtualMachines_extensions_childResource"
}
]
}
Expand All @@ -91,7 +91,7 @@
],
"description": "Microsoft.Compute/virtualMachines"
},
"Microsoft.Compute_virtualMachines_extensions": {
"virtualMachines_extensions": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -124,7 +124,7 @@
],
"description": "Microsoft.Compute/virtualMachines/extensions"
},
"Microsoft.Compute_virtualMachineScaleSets": {
"virtualMachineScaleSets": {
"type": "object",
"properties": {
"type": {
Expand Down Expand Up @@ -678,39 +678,6 @@
},
"description": "Describes Windows Configuration of the OS Profile."
},
"Microsoft.Compute_virtualMachines_extensions_childResource": {
"type": "object",
"properties": {
"type": {
"type": "string",
"enum": [
"extensions"
]
},
"apiVersion": {
"type": "string",
"enum": [
"2016-03-30"
]
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/VirtualMachineExtensionProperties"
},
{
"$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
}
]
}
},
"required": [
"type",
"apiVersion",
"properties"
],
"description": "Microsoft.Compute/virtualMachines/extensions"
},
"NetworkInterfaceReference": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1340,6 +1307,39 @@
},
"description": "Describes the properties of a Virtual Machine."
},
"virtualMachines_extensions_childResource": {
"type": "object",
"properties": {
"type": {
"type": "string",
"enum": [
"extensions"
]
},
"apiVersion": {
"type": "string",
"enum": [
"2016-03-30"
]
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/VirtualMachineExtensionProperties"
},
{
"$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
}
]
}
},
"required": [
"type",
"apiVersion",
"properties"
],
"description": "Microsoft.Compute/virtualMachines/extensions"
},
"VirtualMachineScaleSetExtension": {
"type": "object",
"properties": {
Expand Down

0 comments on commit bc85f48

Please sign in to comment.