Fix review comments

Azure · Aug 3, 2018 · 6d2f752 · 6d2f752
1 parent b4ca3e6
commit 6d2f752
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 90 deletions.
diff --git a/...rce-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyCreate.json b/...rce-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyCreate.json
@@ -3,7 +3,7 @@
     "api-version": "2018-07-01",
     "subscriptionId" : "subid",
     "resourceGroupName" : "rg1",
-    "networkSecurityGroupName" : "testPolicy",
+    "serviceEndpointPolicyName" : "testPolicy",
     "parameters": {}
   },
   "responses" : {
@@ -15,48 +15,20 @@
         "location": "westus",
         "properties": 
          {
-          "serviceEndpointPolicyDefinitions": [
-          {
-            "name": "StorageServiceEndpointPolicyDefinition",
-            "properties": {
-             "description": "Storage Service EndpointPolicy Definition",
-             "service": "Microsoft.Storage",
-             "serviceResources": [
-                "/subscriptions/subid1",
-                "/subscriptions/subid1/resourceGroups/storageRg",
-                "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
-             ]
-            },
-           "provisioningState" : "Succeeded"
-           }
-          ]
-         },
+          "serviceEndpointPolicyDefinitions": [ ]
+         }
       }
     },
     "201" : {
       "body" : {
         "name": "testnsg",
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testnsg",
-        "type": "Microsoft.Network/networkSecurityGroups",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testpolicy",
+        "type": "Microsoft.Network/ServiceEndpointPolicies",
         "location": "westus",
         "properties": 
          {
-          "serviceEndpointPolicyDefinitions": [
-          {
-            "name": "StorageServiceEndpointPolicyDefinition",
-            "properties": {
-             "description": "Storage Service EndpointPolicy Definition",
-             "service": "Microsoft.Storage",
-             "serviceResources": [
-                "/subscriptions/subid1",
-                "/subscriptions/subid1/resourceGroups/storageRg",
-                "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
-             ]
-            },
-           "provisioningState" : "Succeeded"
-           }
-          ]
-         },
+          "serviceEndpointPolicyDefinitions": []
+         }
       }
     }
   }

diff --git a/...crosoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyCreateWithDefinition.json b/...crosoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyCreateWithDefinition.json
@@ -0,0 +1,78 @@
+{
+  "parameters" : {
+    "api-version": "2018-07-01",
+    "subscriptionId" : "subid",
+    "resourceGroupName" : "rg1",
+    "serviceEndpointPolicyName" : "testPolicy",
+    "parameters": {
+    "properties": {
+          "serviceEndpointPolicyDefinitions": [
+          {
+            "name": "StorageServiceEndpointPolicyDefinition",
+            "properties": {
+             "description": "Storage Service EndpointPolicy Definition",
+             "service": "Microsoft.Storage",
+             "serviceResources": [
+                "/subscriptions/subid1",
+                "/subscriptions/subid1/resourceGroups/storageRg",
+                "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
+             ]
+            }
+           }
+         ]
+       }
+      }
+  },
+  "responses" : {
+    "200" : {
+      "body" : {
+        "name": "testnsg",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ServiceEndpointPolicies/testpolicy",
+        "type": "Microsoft.Network/ServiceEndpointPolicies",
+        "location": "westus",
+        "properties": 
+         {
+          "serviceEndpointPolicyDefinitions": [
+          {
+            "name": "StorageServiceEndpointPolicyDefinition",
+            "properties": {
+             "description": "Storage Service EndpointPolicy Definition",
+             "service": "Microsoft.Storage",
+             "serviceResources": [
+                "/subscriptions/subid1",
+                "/subscriptions/subid1/resourceGroups/storageRg",
+                "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
+             ]
+            }
+           }
+          ]
+        }
+      }
+    },
+    "201" : {
+      "body" : {
+        "name": "testnsg",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ServiceEndpointPolicies/testpolicy",
+        "type": "Microsoft.Network/ServiceEndpointPolicies",
+        "location": "westus",
+        "properties": 
+         {
+          "serviceEndpointPolicyDefinitions": [
+          {
+            "name": "StorageServiceEndpointPolicyDefinition",
+            "properties": {
+             "description": "Storage Service EndpointPolicy Definition",
+             "service": "Microsoft.Storage",
+             "serviceResources": [
+                "/subscriptions/subid1",
+                "/subscriptions/subid1/resourceGroups/storageRg",
+                "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
+             ]
+            }
+           }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/...r/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyDefinitionCreate.json b/...r/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyDefinitionCreate.json
@@ -5,6 +5,7 @@
     "resourceGroupName" : "rg1",
     "serviceEndpointPolicyName" : "testPolicy",
     "serviceEndpointPolicyDefinitionName": "testDefinition",
+    "ServiceEndpointPolicyDefinitions": {
     "properties": {
      "description": "Storage Service EndpointPolicy Definition",
      "service": "Microsoft.Storage",
@@ -13,7 +14,8 @@
         "/subscriptions/subid1/resourceGroups/storageRg",
         "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
      ]
-    },
+    }
+   }
   },
   "responses" : {
     "200" : {
@@ -28,7 +30,7 @@
             "/subscriptions/subid1/resourceGroups/storageRg",
             "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
          ]
-    },
+       }
       }
     },
     "201" : {
@@ -43,7 +45,7 @@
             "/subscriptions/subid1/resourceGroups/storageRg",
             "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
          ]
-        },
+        }
       }
     }
   }

diff --git a/...ager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyDefinitionGet.json b/...ager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyDefinitionGet.json
@@ -3,25 +3,23 @@
     "api-version": "2018-07-01",
     "subscriptionId" : "subid",
     "resourceGroupName" : "rg1",
-    "networkSecurityGroupName" : "testnsg",
-    "securityRuleName": "rule1"
+    "serviceEndpointPolicyName" : "testPolicy",
+    "serviceEndpointPolicyDefinitionName": "testDefinition"
   },
   "responses" : {
     "200" : {
       "body" : {
-        "name": "rule1",
-        "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testnsg/securityRules/rule1",
+        "name": "testDefinition",
+        "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/serviceEndpointPolicies/testPolicy/serviceEndpointPolicyDefinitions/testDefinition",
         "properties": {
-          "provisioningState": "Succeeded",
-          "protocol": "*",
-          "sourcePortRange": "*",
-          "destinationPortRange": "80",
-          "sourceAddressPrefix": "*",
-          "destinationAddressPrefix": "*",
-          "access": "Allow",
-          "priority": 130,
-          "direction": "Inbound"
-        }
+         "description": "Storage Service EndpointPolicy Definition",
+         "service": "Microsoft.Storage",
+         "serviceResources": [
+            "/subscriptions/subid1",
+            "/subscriptions/subid1/resourceGroups/storageRg",
+            "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
+         ]
+       }
       }
     }
   }

diff --git a/...ger/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyDefinitionList.json b/...ger/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyDefinitionList.json
@@ -20,7 +20,7 @@
                 "/subscriptions/subid1/resourceGroups/storageRg",
                 "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
              ]
-            },
+            }
           }
         ]
       }

diff --git a/...rce-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyDelete.json b/...rce-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyDelete.json
@@ -1,6 +1,6 @@
 {
   "parameters" : {
-    "api-version": "2018-06-01",
+    "api-version": "2018-07-01",
     "subscriptionId" : "subid",
     "resourceGroupName": "rg1",
     "serviceEndpointPolicyName": "serviceEndpointPolicy1"

diff --git a/...source-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyGet.json b/...source-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyGet.json
@@ -1,6 +1,6 @@
 {
   "parameters" : {
-    "api-version": "2018-06-01",
+    "api-version": "2018-07-01",
     "subscriptionId" : "subid",
     "resourceGroupName": "rg1",
     "serviceEndpointPolicyName": "testServiceEndpointPolicy"
@@ -10,6 +10,7 @@
       "body" : {
         "name" : "testServiceEndpointPolicy",
         "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/serviceEndpointPolicies/testServiceEndpointPolicy",
+        "type": "Microsoft.Network/serviceEndpointPolicies",
         "location" : "westus",
         "properties": 
          {
@@ -24,13 +25,12 @@
                 "/subscriptions/subid1/resourceGroups/storageRg",
                 "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
              ]
-            },
-           "provisioningState" : "Succeeded"
+            }
            }
-          ]
-         },
-        "type" : "Microsoft.Network/serviceEndpointPolicies"
-      }
-    }
-  }
+         ]
+       }
+     }
+   }
+ }
 }
+
diff --git a/...ource-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyList.json b/...ource-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyList.json
@@ -1,6 +1,6 @@
 {
   "parameters" : {
-    "api-version": "2018-06-01",
+    "api-version": "2018-07-01",
     "subscriptionId" : "subid",
     "resourceGroupName": "rg1"
   },
@@ -25,12 +25,10 @@
                     "/subscriptions/subid1resourceGroups/storageRg",
                     "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
                  ]
-                },
-               "provisioningState" : "Succeeded"
+                }
                }
               ]
-             },
-            "type" : "Microsoft.Network/serviceEndpointPolicies"
+             }
           },
           {
             "name" : "testServiceEndpointPolicy1",
@@ -49,12 +47,10 @@
                     "/subscriptions/subid1/resourceGroups/storageRg",
                     "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
                  ]
-                },
-               "provisioningState" : "Succeeded"
+                }
                }
               ]
-             },
-            "type" : "Microsoft.Network/serviceEndpointPolicies"
+            }
           }
         ]
       }

diff --git a/...ce-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyListAll.json b/...ce-manager/Microsoft.Network/stable/2018-07-01/examples/ServiceEndpointPolicyListAll.json
@@ -25,8 +25,7 @@
                     "/subscriptions/subid1/resourceGroups/storageRg",
                     "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
                  ]
-                },
-               "provisioningState" : "Succeeded"
+                }
                }
               ]
             }
@@ -49,8 +48,7 @@
                     "/subscriptions/subid1/resourceGroups/storageRg",
                     "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
                  ]
-                },
-               "provisioningState" : "Succeeded"
+                }
                }
               ]
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ @@
                     "/subscriptions/subid1/resourceGroups/storageRg",
                     "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
                  ]
-                },
+                }
               }
             ]
           }
@@ Expand Down @@