Update resource association swagger (Azure#18432)

* update access mode values * update examples * Add 202 in delete spec * Add provisioning issues changes * update schema * review changs * update * typo in model fix * make provisioning issues readonly * Add one example in list association, provisioning state enum update * Add logggin categories in profile * examples update * update * update examples * reformat code * Add x-msidentifier for logger * update * provisioning state fix * Fix provisioning state * Add location header in delete nsp association * update location header * update location header * location header update Co-authored-by: Kaushal Kumar <[email protected]>
grucloud · May 16, 2022 · f75c252 · f75c252
1 parent 0885591
commit f75c252
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 19 deletions.
diff --git a/...e-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationDelete.json b/...e-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationDelete.json
@@ -5,10 +5,16 @@
     "subscriptionId": "subId",
     "resourceGroupName": "rg1",
     "networkSecurityPerimeterName": "nsp1",
-    "associationName": "association1"
+    "associationName": "association1",
+    "operationId": "operationId1"
   },
   "responses": {
     "200": {},
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/resourceAssociations/{associationName}/operationResults/{operationId}?api-version={api-version}"
+      }
+    },
     "204": {}
   }
 }
diff --git a/...urce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationGet.json b/...urce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationGet.json
@@ -21,7 +21,8 @@
           "profile": {
             "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
           },
-          "accessMode": "EnforceMode"
+          "accessMode": "Enforced",
+          "hasProvisioningIssues": "no"
         }
       }
     }

diff --git a/...rce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationList.json b/...rce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationList.json
@@ -22,7 +22,8 @@
               "profile": {
                 "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
               },
-              "accessMode": "EnforceMode"
+              "accessMode": "Enforced",
+              "hasProvisioningIssues": "no"
             }
           },
           {
@@ -37,7 +38,24 @@
               "profile": {
                 "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
               },
-              "accessMode": "DryRunMode"
+              "accessMode": "Audit",
+              "hasProvisioningIssues": "no"
+            }
+          },
+          {
+            "name": "association3",
+            "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/resourceAssociations/association3",
+            "type": "Microsoft.Network/networkSecurityPerimeters/resourceAssociations",
+            "properties": {
+              "provisioningState": "Failed",
+              "privateLinkResource": {
+                "id": "/subscriptions/{paasSubscriptionId}/resourceGroups/{paasResourceGroupName}/providers/{providerName}/{resourceType}/{resourceName}"
+              },
+              "profile": {
+                "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
+              },
+              "accessMode": "Learning",
+              "hasProvisioningIssues": "yes"
             }
           }
         ],

diff --git a/...urce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationPut.json b/...urce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationPut.json
@@ -14,7 +14,7 @@
         "profile": {
           "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
         },
-        "accessMode": "EnforceMode"
+        "accessMode": "Enforced"
       }
     }
   },
@@ -32,7 +32,8 @@
           "profile": {
             "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
           },
-          "accessMode": "EnforceMode"
+          "accessMode": "Enforced",
+          "hasProvisioningIssues": "no"
         }
       }
     },
@@ -49,7 +50,8 @@
           "profile": {
             "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
           },
-          "accessMode": "EnforceMode"
+          "accessMode": "Enforced",
+          "hasProvisioningIssues": "no"
         }
       }
     }

diff --git a/...resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileGet.json b/...resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileGet.json
@@ -15,7 +15,12 @@
         "type": "Microsoft.Network/networkSecurityPerimeters/profiles",
         "location": "resource location",
         "properties": {
-          "accessRulesVersion": "0"
+          "accessRulesVersion": "0",
+          "enabledLogCategories": [
+            {
+              "name": "NSPOutboundAccessAllowed"
+            }
+          ]
         }
       }
     }

diff --git a/...esource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileList.json b/...esource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileList.json
@@ -16,7 +16,12 @@
             "type": "Microsoft.Network/networkSecurityPerimeters/profiles",
             "location": "resource location",
             "properties": {
-              "accessRulesVersion": "0"
+              "accessRulesVersion": "0",
+              "enabledLogCategories": [
+                {
+                  "name": "NSPOutboundAccessDenied"
+                }
+              ]
             }
           },
           {
@@ -25,7 +30,12 @@
             "type": "Microsoft.Network/networkSecurityPerimeters/profiles",
             "location": "resource location",
             "properties": {
-              "accessRulesVersion": "0"
+              "accessRulesVersion": "0",
+              "enabledLogCategories": [
+                {
+                  "name": "NSPOutboundAttempt"
+                }
+              ]
             }
           }
         ],

diff --git a/...resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfilePut.json b/...resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfilePut.json
@@ -18,7 +18,12 @@
         "type": "Microsoft.Network/networkSecurityPerimeters/profiles",
         "location": "East US 2 EUAP",
         "properties": {
-          "accessRulesVersion": "0"
+          "accessRulesVersion": "0",
+          "enabledLogCategories": [
+            {
+              "name": "NSPInboundAccessAllowed"
+            }
+          ]
         }
       }
     },
@@ -29,7 +34,12 @@
         "type": "Microsoft.Network/networkSecurityPerimeters/profiles",
         "location": "East US 2 EUAP",
         "properties": {
-          "accessRulesVersion": "0"
+          "accessRulesVersion": "0",
+          "enabledLogCategories": [
+            {
+              "name": "NSPInboundAccessDenied"
+            }
+          ]
         }
       }
     }

diff --git a/...source-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json b/...source-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json
@@ -668,6 +668,15 @@
           "200": {
             "description": "Delete Succeed."
           },
+          "202": {
+            "description": "Delete in progress.",
+            "headers": {
+              "location": {
+                "description": "location header",
+                "type": "string"
+              }
+            }
+          },
           "204": {
             "description": "Request successful. The resource does not exist."
           },
@@ -678,6 +687,7 @@
             }
           }
         },
+        "x-ms-long-running-operation": true,
         "x-ms-examples": {
           "NspAssociationDelete": {
             "$ref": "./examples/NspAssociationDelete.json"
@@ -846,7 +856,7 @@
         },
         "provisioningState": {
           "readOnly": true,
-          "$ref": "./network.json#/definitions/ProvisioningState",
+          "$ref": "#/definitions/NSPProvisioningState",
           "description": "The provisioning state of the scope assignment resource."
         }
       },
@@ -906,6 +916,16 @@
           "readOnly": true,
           "type": "string",
           "description": "Version number that increases with every update to access rules within the profile."
+        },
+        "enabledLogCategories": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LoggingCategory"
+          },
+          "x-ms-identifiers": [
+            "name"
+          ],
+          "description": "Gets the enabled log categories."
         }
       },
       "description": "Properties of NSP profile."
@@ -962,7 +982,7 @@
       "properties": {
         "provisioningState": {
           "readOnly": true,
-          "$ref": "./network.json#/definitions/ProvisioningState",
+          "$ref": "#/definitions/NSPProvisioningState",
           "description": "The provisioning state of the scope assignment resource."
         },
         "direction": {
@@ -1080,7 +1100,7 @@
       "properties": {
         "provisioningState": {
           "readOnly": true,
-          "$ref": "./network.json#/definitions/ProvisioningState",
+          "$ref": "#/definitions/NSPProvisioningState",
           "description": "The provisioning state of the resource  association resource."
         },
         "privateLinkResource": {
@@ -1094,16 +1114,20 @@
         "accessMode": {
           "type": "string",
           "enum": [
-            "Unspecified",
-            "EnforceMode",
-            "LearningMode",
-            "DryRunMode"
+            "Learning",
+            "Enforced",
+            "Audit"
           ],
           "x-ms-enum": {
             "name": "AssociationAccessMode",
             "modelAsString": true
           },
           "description": "Access mode on the association."
+        },
+        "hasProvisioningIssues": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Specifies if there are provisioning issues"
         }
       }
     },
@@ -1177,6 +1201,33 @@
         }
       },
       "description": "Properties of the perimeter associable resources."
+    },
+    "LoggingCategory": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the logging category."
+        }
+      },
+      "description": "Logging Category"
+    },
+    "NSPProvisioningState": {
+      "type": "string",
+      "readOnly": true,
+      "description": "The current provisioning state.",
+      "enum": [
+        "Succeeded",
+        "Creating",
+        "Updating",
+        "Deleting",
+        "Accepted",
+        "Failed"
+      ],
+      "x-ms-enum": {
+        "name": "nspProvisioningState",
+        "modelAsString": true
+      }
     }
   },
   "parameters": {