Merge pull request #1 from Azure/master

Merge from master
Azure · Jan 3, 2016 · 89ab55d · 89ab55d
2 parents 47357b7 + 47c02c0
commit 89ab55d
Show file tree

Hide file tree

Showing 29 changed files with 17,888 additions and 4,204 deletions.
diff --git a/README.md b/README.md
@@ -44,11 +44,21 @@ The structure should appear like so:
 │       └── swagger
 │           └── service.json
 ├── arm-web
+├── documentation
 └── readme.md
 ```
 
 At this point, the specifications are expected to be in swagger format.
 
+## Creating the Swagger Specification for Azure
+This [document](./documentation/creating-swagger.md) will help you understand how AutoRest converts Swagger in to code.
+
+## How to validate your swagger
+* [You can use this json schema validator](https://json-schema-validator.herokuapp.com/)
+  * In the upper left box, paste the [swagger schema from here](https://github.com/swagger-api/swagger-spec/blob/master/schemas/v2.0/schema.json)
+  * In the lower left box, paste your swagger json
+  * Upon clicking the validate button, you should either see errors or success.
+
 ## Generating Code from Specifications
 
 If you are interested in generating code from these specifications, please check out [AutoRest](https://github.com/azure/autorest). There you will find the code generator as well as instructions on how to use it.

diff --git a/arm-authorization/2015-07-01/swagger/authorization.json b/arm-authorization/2015-07-01/swagger/authorization.json
@@ -44,7 +44,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "nextLink"
         }
       }
     },
@@ -79,7 +79,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "nextLink"
         }
       }
     },
@@ -144,7 +144,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "nextLink"
         }
       }
     },
@@ -224,7 +224,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "nextLink"
         }
       }
     },
@@ -753,11 +753,11 @@
             "description": "Role definition id."
           },
           {
-            "name": "parameters",
+            "name": "roleDefinition",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/RoleDefinitionCreateOrUpdateParameters"
+              "$ref": "#/definitions/RoleDefinition"
             },
             "description": "Role definition."
           },
@@ -850,9 +850,9 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "nextLink"
         },
-        "x-ms-odata": "#/definitions/RoleDefinition"
+        "x-ms-odata": "#/definitions/RoleDefinitionFilter"
       }
     }
   },
@@ -866,6 +866,15 @@
       },
       "description": "Role Assignments filter"
     },
+    "RoleDefinitionFilter": {
+      "properties": {
+        "roleName": {
+          "type": "string",
+          "description": "Returns role definition with the specific name."
+        }
+      },
+      "description": "Role Definitions filter"
+    },
     "ClassicAdministratorProperties": {
       "properties": {
         "emailAddress": {
@@ -1163,15 +1172,6 @@
       },
       "description": "Role definition."
     },
-    "RoleDefinitionCreateOrUpdateParameters": {
-      "properties": {
-        "RoleDefinition": {
-          "$ref": "#/definitions/RoleDefinition",
-          "description": "Gets or sets role definition properties."
-        }
-      },
-      "description": "Role definition create or update parameters."
-    },
     "RoleDefinitionListResult": {
       "properties": {
         "value": {