Merge branch 'dev/daschult/AddChildResources'

jianghaolu · May 11, 2016 · 075398c · 075398c
2 parents b14c51d + fb19554
commit 075398c
Show file tree

Hide file tree

Showing 9 changed files with 1,095 additions and 30 deletions.
diff --git a/.../Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/CDN/Microsoft.Cdn.json b/.../Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/CDN/Microsoft.Cdn.json
@@ -35,6 +35,16 @@
           "description": "The SKU (pricing tier) of the CDN profile."
         }
       },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_childResource"
+            }
+          ]
+        }
+      },
       "required": [
         "type",
         "apiVersion",
@@ -73,6 +83,19 @@
           "$ref": "#/definitions/EndpointPropertiesCreateParameters"
         }
       },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_customDomains_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_origins_childResource"
+            }
+          ]
+        }
+      },
       "required": [
         "type",
         "apiVersion",
@@ -236,6 +259,109 @@
         "origins"
       ]
     },
+    "Microsoft.Cdn_profiles_endpoints_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "endpoints"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Endpoint location"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Endpoint tags"
+        },
+        "properties": {
+          "$ref": "#/definitions/EndpointPropertiesCreateParameters"
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_customDomains_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_origins_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties",
+        "location"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints"
+    },
+    "Microsoft.Cdn_profiles_endpoints_customDomains_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "customDomains"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "properties": {
+          "$ref": "#/definitions/CustomDomainPropertiesParameters"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints/customDomains"
+    },
+    "Microsoft.Cdn_profiles_endpoints_origins_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "origins"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "properties": {
+          "$ref": "#/definitions/OriginPropertiesParameters"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints/origins"
+    },
     "OriginPropertiesParameters": {
       "type": "object",
       "properties": {

diff --git a/...ors/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Compute/Microsoft.Compute.json b/...ors/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Compute/Microsoft.Compute.json
@@ -53,6 +53,16 @@
           "$ref": "#/definitions/VirtualMachineProperties"
         }
       },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Compute_virtualMachines_extensions_childResource"
+            }
+          ]
+        }
+      },
       "required": [
         "type",
         "apiVersion",
@@ -458,6 +468,32 @@
       },
       "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": {
+          "$ref": "#/definitions/VirtualMachineExtensionProperties"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Compute/virtualMachines/extensions"
+    },
     "NetworkInterfaceReference": {
       "type": "object",
       "properties": {