Fixing properties in Swagger & updating examples to reflect fixes

Azure · Aug 31, 2018 · 0139e0a · 0139e0a
1 parent ea8045e
commit 0139e0a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 10 deletions.
diff --git a/...urce-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetCreateWithDelegation.json b/...urce-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetCreateWithDelegation.json
@@ -27,11 +27,13 @@
                 "provisioningState": "Succeeded",
                 "serviceName": "Microsoft.Provider/resourceType",
                 "actions": []
-              }
+              },
+              "type": "Microsoft.Network/virtualNetworks/subnets/delegations"
             }
           ],
           "purpose": ""
-        }
+        },
+        "type": "Microsoft.Network/virtualNetworks/subnets"
       }
     },
     "201": {
@@ -49,11 +51,13 @@
                 "provisioningState": "Succeeded",
                 "serviceName": "Microsoft.Provider/resourceType",
                 "actions": []
-              }
+              },
+              "type": "Microsoft.Network/virtualNetworks/subnets/delegations"
             }
           ],
           "purpose": ""
-        }
+        },
+        "type": "Microsoft.Network/virtualNetworks/subnets"
       }
     }
   }

diff --git a/...esource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetGetWithDelegation.json b/...esource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetGetWithDelegation.json
@@ -22,11 +22,13 @@
                 "provisioningState": "Succeeded",
                 "serviceName": "Microsoft.Provider/resourceType",
                 "actions": []
-              }
+              },
+              "type": "Microsoft.Network/virtualNetworks/subnets/delegations"
             }
           ],
           "purpose": ""
-        }
+        },
+        "type": "Microsoft.Network/virtualNetworks/subnets"
       }
     }
   }

diff --git a/...icrosoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateSubnetWithDelegation.json b/...icrosoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateSubnetWithDelegation.json
@@ -59,11 +59,13 @@
                       "provisioningState": "Succeeded",
                       "serviceName": "Microsoft.Provider/resourceType",
                       "actions": []
-                    }
+                    },
+                    "type": "Microsoft.Network/virtualNetworks/subnets/delegations"
                   }
                 ],
                 "purpose": ""
-              }
+              },
+              "type": "Microsoft.Network/virtualNetworks/subnets"
             }
           ],
           "virtualNetworkPeerings" : []

diff --git a/...r/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithSubnetDelegation.json b/...r/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithSubnetDelegation.json
@@ -39,11 +39,13 @@
                       "provisioningState": "Succeeded",
                       "serviceName": "Microsoft.Provider/resourceType",
                       "actions": []
-                    }
+                    },
+                    "type": "Microsoft.Network/virtualNetworks/subnets/delegations"
                   }
                 ],
                 "purpose": ""
-              }
+              },
+              "type": "Microsoft.Network/virtualNetworks/subnets"
             }
           ],
           "virtualNetworkPeerings" : []

diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2018-08-01/virtualNetwork.json b/...fication/network/resource-manager/Microsoft.Network/stable/2018-08-01/virtualNetwork.json
@@ -870,6 +870,17 @@
         "serviceName": {
           "type": "string",
           "description": "The name of the service to whom the subnet should be delegated (e.g. Microsoft.Sql/servers)"
+        },
+        "actions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Describes the actions permitted to the service upon delegation"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "The provisioning state of the resource."
         }
       },
       "description": "Properties of a service delegation."
@@ -890,6 +901,11 @@
           "description": "A unique read-only string that changes whenever the resource is updated."
         }
       },
+      "allOf": [
+        {
+          "$ref": "./network.json#/definitions/SubResource"
+        }
+      ],
       "description": "Details the service to which the subnet is delegated."
     },
     "SubnetPropertiesFormat": {