Fixes in model

Meha Kaushik · Meha Kaushik · commit 97a6a0b62c67 · 2020-05-04T17:17:23.000-07:00
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/cosmos-db.json
@@ -6727,7 +6727,13 @@
     },
     "IpAddressOrRange": {
       "type": "string",
-      "description": "A single IPv4 address or a single IPv4 address range in CIDR format. Provided IPs must be well-formatted and cannot be contained in one of the following ranges: 10.0.0.0/8, 100.64.0.0/10, 172.16.0.0/12, 192.168.0.0/16, since these are not enforceable by the IP address filter. Example of valid inputs: “23.40.210.245” or “23.40.210.0/8”."
+      "description": "IpAddressOrRange object",
+      "properties": {
+        "value": {
+        "type": "string",
+        "description": "A single IPv4 address or a single IPv4 address range in CIDR format. Provided IPs must be well-formatted and cannot be contained in one of the following ranges: 10.0.0.0/8, 100.64.0.0/10, 172.16.0.0/12, 192.168.0.0/16, since these are not enforceable by the IP address filter. Example of valid inputs: “23.40.210.245” or “23.40.210.0/8”."
+      }
+    }
     },
     "VirtualNetworkRule": {
       "type": "object",
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountCreateMax.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountCreateMax.json
@@ -12,10 +12,14 @@
         "databaseAccountOfferType": "Standard",
         "ipRules": [
           {
-            "ipAddressOrRange": "23.43.230.120"
+            "ipAddressOrRange": {
+              "value": "23.43.230.120"
+            }
           },
           {
-            "ipAddressOrRange": "110.12.240.0/12"
+            "ipAddressOrRange":{
+              "value": "110.12.240.0/12"
+            }
           }
         ],
         "isVirtualNetworkFilterEnabled": true,
@@ -128,10 +132,14 @@
           "enableFreeTier": false,
           "ipRules": [
             {
-              "ipAddressOrRange": "23.43.230.120"
+              "ipAddressOrRange": {
+                "value": "23.43.230.120"
+              }
             },
             {
-              "ipAddressOrRange": "110.12.240.0/12"
+              "ipAddressOrRange":{
+                "value": "110.12.240.0/12"
+              }
             }
           ]
         }
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountPatch.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountPatch.json
@@ -12,7 +12,9 @@
       "properties": {
         "ipRules": [
           {
-            "ipAddressOrRange": "10.10.10.10"
+            "ipAddressOrRange": {
+              "value": "10.10.10.10"
+            }
           }
         ],
         "isVirtualNetworkFilterEnabled": true,
@@ -48,7 +50,9 @@
           "databaseAccountOfferType": "Standard",
           "ipRules": [
             {
-              "ipAddressOrRange": "10.10.10.10"
+              "ipAddressOrRange": {
+                "value": "10.10.10.10"
+              }
             }
           ],
           "isVirtualNetworkFilterEnabled": true,

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,14 @@`
`12`	`12`	`"databaseAccountOfferType": "Standard",`
`13`	`13`	`"ipRules": [`
`14`	`14`	`{`
`15`		`- "ipAddressOrRange": "23.43.230.120"`
	`15`	`+ "ipAddressOrRange": {`
	`16`	`+ "value": "23.43.230.120"`
	`17`	`+ }`
`16`	`18`	`},`
`17`	`19`	`{`
`18`		`- "ipAddressOrRange": "110.12.240.0/12"`
	`20`	`+ "ipAddressOrRange":{`
	`21`	`+ "value": "110.12.240.0/12"`
	`22`	`+ }`
`19`	`23`	`}`
`20`	`24`	`],`
`21`	`25`	`"isVirtualNetworkFilterEnabled": true,`
`@@ -128,10 +132,14 @@`
`128`	`132`	`"enableFreeTier": false,`
`129`	`133`	`"ipRules": [`
`130`	`134`	`{`
`131`		`- "ipAddressOrRange": "23.43.230.120"`
	`135`	`+ "ipAddressOrRange": {`
	`136`	`+ "value": "23.43.230.120"`
	`137`	`+ }`
`132`	`138`	`},`
`133`	`139`	`{`
`134`		`- "ipAddressOrRange": "110.12.240.0/12"`
	`140`	`+ "ipAddressOrRange":{`
	`141`	`+ "value": "110.12.240.0/12"`
	`142`	`+ }`
`135`	`143`	`}`
`136`	`144`	`]`
`137`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@`
`12`	`12`	`"properties": {`
`13`	`13`	`"ipRules": [`
`14`	`14`	`{`
`15`		`- "ipAddressOrRange": "10.10.10.10"`
	`15`	`+ "ipAddressOrRange": {`
	`16`	`+ "value": "10.10.10.10"`
	`17`	`+ }`
`16`	`18`	`}`
`17`	`19`	`],`
`18`	`20`	`"isVirtualNetworkFilterEnabled": true,`
`@@ -48,7 +50,9 @@`
`48`	`50`	`"databaseAccountOfferType": "Standard",`
`49`	`51`	`"ipRules": [`
`50`	`52`	`{`
`51`		`- "ipAddressOrRange": "10.10.10.10"`
	`53`	`+ "ipAddressOrRange": {`
	`54`	`+ "value": "10.10.10.10"`
	`55`	`+ }`
`52`	`56`	`}`
`53`	`57`	`],`
`54`	`58`	`"isVirtualNetworkFilterEnabled": true,`