Update swagger for outbound public ip feature (Azure#10713)

* update swagger for outbound public ip feature * Update samples * prettier all the files * fix typo for 'outboundIPs' & 'publicIPs' properties Co-authored-by: Xuyang Cao <xuycao@microsoft.com>
nitegupt · Sep 25, 2020 · ec3a03b · ec3a03b
1 parent 99ba92c
commit ec3a03b
Show file tree

Hide file tree

Showing 14 changed files with 195 additions and 20 deletions.
diff --git a/...atform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json b/...atform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json
@@ -2479,6 +2479,21 @@
         "appNetworkResourceGroup": {
           "description": "Name of the resource group containing network resources of Azure Spring Cloud Apps",
           "type": "string"
+        },
+        "outboundIPs": {
+          "description": "Desired outbound IP resources for Azure Spring Cloud instance.",
+          "type": "object",
+          "readOnly": true,
+          "properties": {
+            "publicIPs": {
+              "type": "array",
+              "readOnly": true,
+              "items": {
+                "type": "string"
+              },
+              "description": "A list of public IP addresses."
+            }
+          }
         }
       }
     },

diff --git a/...er/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate.json b/...er/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate.json
@@ -54,7 +54,15 @@
             "enabled": true,
             "appInsightInstrumentationKey": "00000000-0000-0000-0000-000000000000"
           },
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {
@@ -90,7 +98,15 @@
             "enabled": true,
             "appInsightInstrumentationKey": "00000000-0000-0000-0000-000000000000"
           },
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {

diff --git a/...ppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json b/...ppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json
@@ -34,7 +34,12 @@
             "appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
             "serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
             "serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
-            "appNetworkResourceGroup": "my-app-network-rg"
+            "appNetworkResourceGroup": "my-app-network-rg",
+            "outboundIPs": {
+              "publicIPs": [
+                "40.64.67.13"
+              ]
+            }
           },
           "serviceId": "12345678abcd1234abcd12345678abcd"
         },
@@ -60,7 +65,12 @@
             "appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
             "serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
             "serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
-            "appNetworkResourceGroup": "my-app-network-rg"
+            "appNetworkResourceGroup": "my-app-network-rg",
+            "outboundIPs": {
+              "publicIPs": [
+                "40.64.67.13"
+              ]
+            }
           },
           "serviceId": "12345678abcd1234abcd12345678abcd"
         },

diff --git a/...ource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Get.json b/...ource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Get.json
@@ -27,7 +27,15 @@
             "enabled": true,
             "appInsightInstrumentationKey": "00000000-0000-0000-0000-000000000000"
           },
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {

diff --git a/...urce-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_List.json b/...urce-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_List.json
@@ -28,7 +28,15 @@
                 "enabled": true,
                 "appInsightInstrumentationKey": "00000000-0000-0000-0000-000000000000"
               },
-              "serviceId": "12345678abcd1234abcd12345678abcd"
+              "serviceId": "12345678abcd1234abcd12345678abcd",
+              "networkProfile": {
+                "outboundIPs": {
+                  "publicIPs": [
+                    "20.39.3.173",
+                    "40.64.67.13"
+                  ]
+                }
+              }
             },
             "type": "Microsoft.AppPlatform/Spring",
             "sku": {

diff --git a/...icrosoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListBySubscription.json b/...icrosoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListBySubscription.json
@@ -27,7 +27,15 @@
                 "enabled": true,
                 "appInsightInstrumentationKey": "00000000-0000-0000-0000-000000000000"
               },
-              "serviceId": "12345678abcd1234abcd12345678abcd"
+              "serviceId": "12345678abcd1234abcd12345678abcd",
+              "networkProfile": {
+                "outboundIPs": {
+                  "publicIPs": [
+                    "20.39.3.173",
+                    "40.64.67.13"
+                  ]
+                }
+              }
             },
             "type": "Microsoft.AppPlatform/Spring",
             "sku": {

diff --git a/...ce-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Update.json b/...ce-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Update.json
@@ -54,7 +54,15 @@
             "enabled": true,
             "appInsightInstrumentationKey": "00000000-0000-0000-0000-000000000000"
           },
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {
@@ -90,7 +98,15 @@
             "enabled": true,
             "appInsightInstrumentationKey": "00000000-0000-0000-0000-000000000000"
           },
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {

diff --git a/...ion/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/appplatform.json b/...ion/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/appplatform.json
@@ -2951,6 +2951,21 @@
         "appNetworkResourceGroup": {
           "description": "Name of the resource group containing network resources of Azure Spring Cloud Apps",
           "type": "string"
+        },
+        "outboundIPs": {
+          "description": "Desired outbound IP resources for Azure Spring Cloud instance.",
+          "type": "object",
+          "readOnly": true,
+          "properties": {
+            "publicIPs": {
+              "type": "array",
+              "readOnly": true,
+              "items": {
+                "type": "string"
+              },
+              "description": "A list of public IP addresses."
+            }
+          }
         }
       }
     },

diff --git a/...rce-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_CreateOrUpdate.json b/...rce-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_CreateOrUpdate.json
@@ -21,7 +21,15 @@
       "body": {
         "properties": {
           "provisioningState": "Creating",
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {
@@ -40,7 +48,15 @@
       "body": {
         "properties": {
           "provisioningState": "Succeeded",
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {
@@ -59,7 +75,15 @@
       "body": {
         "properties": {
           "provisioningState": "Updating",
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {

diff --git a/...crosoft.AppPlatform/stable/2020-07-01/examples/Services_CreateOrUpdate_VNetInjection.json b/...crosoft.AppPlatform/stable/2020-07-01/examples/Services_CreateOrUpdate_VNetInjection.json
@@ -34,7 +34,12 @@
             "appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
             "serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
             "serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
-            "appNetworkResourceGroup": "my-app-network-rg"
+            "appNetworkResourceGroup": "my-app-network-rg",
+            "outboundIPs": {
+              "publicIPs": [
+                "40.64.67.13"
+              ]
+            }
           },
           "serviceId": "12345678abcd1234abcd12345678abcd"
         },
@@ -60,7 +65,12 @@
             "appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
             "serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
             "serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
-            "appNetworkResourceGroup": "my-app-network-rg"
+            "appNetworkResourceGroup": "my-app-network-rg",
+            "outboundIPs": {
+              "publicIPs": [
+                "40.64.67.13"
+              ]
+            }
           },
           "serviceId": "12345678abcd1234abcd12345678abcd"
         },
@@ -86,7 +96,12 @@
             "appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
             "serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
             "serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
-            "appNetworkResourceGroup": "my-app-network-rg"
+            "appNetworkResourceGroup": "my-app-network-rg",
+            "outboundIPs": {
+              "publicIPs": [
+                "40.64.67.13"
+              ]
+            }
           },
           "serviceId": "12345678abcd1234abcd12345678abcd"
         },

diff --git a/...tform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_Get.json b/...tform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_Get.json
@@ -10,7 +10,15 @@
       "body": {
         "properties": {
           "provisioningState": "Succeeded",
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {

diff --git a/...form/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_List.json b/...form/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_List.json
@@ -11,7 +11,15 @@
           {
             "properties": {
               "provisioningState": "Succeeded",
-              "serviceId": "12345678abcd1234abcd12345678abcd"
+              "serviceId": "12345678abcd1234abcd12345678abcd",
+              "networkProfile": {
+                "outboundIPs": {
+                  "publicIPs": [
+                    "20.39.3.173",
+                    "40.64.67.13"
+                  ]
+                }
+              }
             },
             "type": "Microsoft.AppPlatform/Spring",
             "sku": {

diff --git a/...manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_ListBySubscription.json b/...manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_ListBySubscription.json
@@ -10,7 +10,15 @@
           {
             "properties": {
               "provisioningState": "Succeeded",
-              "serviceId": "12345678abcd1234abcd12345678abcd"
+              "serviceId": "12345678abcd1234abcd12345678abcd",
+              "networkProfile": {
+                "outboundIPs": {
+                  "publicIPs": [
+                    "20.39.3.173",
+                    "40.64.67.13"
+                  ]
+                }
+              }
             },
             "type": "Microsoft.AppPlatform/Spring",
             "sku": {

diff --git a/...rm/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_Update.json b/...rm/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_Update.json
@@ -21,7 +21,15 @@
       "body": {
         "properties": {
           "provisioningState": "Updating",
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {
@@ -40,7 +48,15 @@
       "body": {
         "properties": {
           "provisioningState": "Succeeded",
-          "serviceId": "12345678abcd1234abcd12345678abcd"
+          "serviceId": "12345678abcd1234abcd12345678abcd",
+          "networkProfile": {
+            "outboundIPs": {
+              "publicIPs": [
+                "20.39.3.173",
+                "40.64.67.13"
+              ]
+            }
+          }
         },
         "type": "Microsoft.AppPlatform/Spring",
         "sku": {