Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs

Azure · Dec 29, 2015 · 35f7ab1 · 35f7ab1
2 parents b4846c7 + 7caa97f
commit 35f7ab1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/arm-authorization/2015-07-01/swagger/authorization.json b/arm-authorization/2015-07-01/swagger/authorization.json
@@ -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."
           },
@@ -852,7 +852,7 @@
         "x-ms-pageable": {
           "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": {

diff --git a/arm-network/2015-06-15/swagger/network.json b/arm-network/2015-06-15/swagger/network.json
@@ -5437,11 +5437,6 @@
           "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
         }
       },
-      "required": [
-        "protocol",
-        "frontendPort",
-        "enableFloatingIP"
-      ],
       "description": "Properties of Inbound NAT rule"
     },
     "InboundNatRule": {
@@ -5534,7 +5529,7 @@
     },
     "OutboundNatRulePropertiesFormat": {
       "properties": {
-        "allocatedOutboundPort": {
+        "allocatedOutboundPorts": {
           "type": "integer",
           "format": "int32",
           "description": "Gets or sets the number of outbound ports to be used for SNAT"
@@ -5556,7 +5551,6 @@
         }
       },
       "required": [
-        "allocatedOutboundPorts",
         "backendAddressPool"
       ],
       "description": "Outbound NAT pool of the loadbalancer"
@@ -6129,9 +6123,6 @@
           "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
         }
       },
-      "required": [
-        "publicIPAllocationMethod"
-      ],
       "description": "PublicIpAddress properties"
     },
     "PublicIPAddress": {
@@ -6390,10 +6381,7 @@
           "type": "string",
           "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
         }
-      },
-      "required": [
-        "addressPrefix"
-      ]
+      }
     },
     "Subnet": {
       "properties": {