Merge pull request Azure#215 from ZengTaoxu/resolve-inconsistency-net…

…work Update command models for network
ShreyaAnand · Jul 4, 2023 · 82e6919 · 82e6919
2 parents e1cdd21 + 91e47fe
commit 82e6919
Show file tree

Hide file tree

Showing 55 changed files with 4,053 additions and 60,450 deletions.
diff --git a/Commands/tree.json b/Commands/tree.json
diff --git a/...vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2FwcGxpY2F0aW9uc2VjdXJpdHlncm91cHM=/2021-08-01.json b/...vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2FwcGxpY2F0aW9uc2VjdXJpdHlncm91cHM=/2021-08-01.json
diff --git a/...0vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2FwcGxpY2F0aW9uc2VjdXJpdHlncm91cHM=/2021-08-01.xml b/...0vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2FwcGxpY2F0aW9uc2VjdXJpdHlncm91cHM=/2021-08-01.xml
@@ -7,15 +7,9 @@
       <resource id="/subscriptions/{}/providers/microsoft.network/applicationsecuritygroups" version="2021-08-01" swagger="mgmt-plane/network/ResourceProviders/Microsoft.Network/Paths/L3N1YnNjcmlwdGlvbnMve3N1YnNjcmlwdGlvbklkfS9wcm92aWRlcnMvTWljcm9zb2Z0Lk5ldHdvcmsvYXBwbGljYXRpb25TZWN1cml0eUdyb3Vwcw==/V/MjAyMS0wOC0wMQ=="/>
       <resource id="/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/applicationsecuritygroups" version="2021-08-01" swagger="mgmt-plane/network/ResourceProviders/Microsoft.Network/Paths/L3N1YnNjcmlwdGlvbnMve3N1YnNjcmlwdGlvbklkfS9yZXNvdXJjZUdyb3Vwcy97cmVzb3VyY2VHcm91cE5hbWV9L3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9hcHBsaWNhdGlvblNlY3VyaXR5R3JvdXBz/V/MjAyMS0wOC0wMQ=="/>
       <argGroup name="">
-        <arg type="ResourceGroupName" var="$Path.resourceGroupName" options="resource-group g"/>
-        <arg type="SubscriptionId" var="$Path.subscriptionId" options="subscription" required="True"/>
+        <arg type="ResourceGroupName" var="$Path.resourceGroupName" options="resource-group g" idPart="resource_group"/>
+        <arg type="SubscriptionId" var="$Path.subscriptionId" options="subscription" required="True" idPart="subscription"/>
       </argGroup>
-      <condition var="$Condition_ApplicationSecurityGroups_List">
-        <operator type="and">
-          <operator type="hasValue" arg="$Path.resourceGroupName"/>
-          <operator type="hasValue" arg="$Path.subscriptionId"/>
-        </operator>
-      </condition>
       <condition var="$Condition_ApplicationSecurityGroups_ListAll">
         <operator type="and">
           <operator type="hasValue" arg="$Path.subscriptionId"/>
@@ -24,11 +18,16 @@
           </operator>
         </operator>
       </condition>
-      <operation when="$Condition_ApplicationSecurityGroups_List" operationId="ApplicationSecurityGroups_List">
-        <http path="/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups">
+      <condition var="$Condition_ApplicationSecurityGroups_List">
+        <operator type="and">
+          <operator type="hasValue" arg="$Path.resourceGroupName"/>
+          <operator type="hasValue" arg="$Path.subscriptionId"/>
+        </operator>
+      </condition>
+      <operation when="$Condition_ApplicationSecurityGroups_ListAll" operationId="ApplicationSecurityGroups_ListAll">
+        <http path="/subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationSecurityGroups">
           <request method="get">
             <path>
-              <param type="string" name="resourceGroupName" arg="$Path.resourceGroupName" required="True"/>
               <param type="string" name="subscriptionId" arg="$Path.subscriptionId" required="True"/>
             </path>
             <query>
@@ -82,10 +81,11 @@
           </response>
         </http>
       </operation>
-      <operation when="$Condition_ApplicationSecurityGroups_ListAll" operationId="ApplicationSecurityGroups_ListAll">
-        <http path="/subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationSecurityGroups">
+      <operation when="$Condition_ApplicationSecurityGroups_List" operationId="ApplicationSecurityGroups_List">
+        <http path="/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups">
           <request method="get">
             <path>
+              <param type="string" name="resourceGroupName" arg="$Path.resourceGroupName" required="True"/>
               <param type="string" name="subscriptionId" arg="$Path.subscriptionId" required="True"/>
             </path>
             <query>

diff --git a/...vbnMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2Rkb3Nwcm90ZWN0aW9ucGxhbnM=/2022-05-01.json b/...vbnMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2Rkb3Nwcm90ZWN0aW9ucGxhbnM=/2022-05-01.json
diff --git a/...lvbnMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2Rkb3Nwcm90ZWN0aW9ucGxhbnM=/2022-05-01.xml b/...lvbnMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2Rkb3Nwcm90ZWN0aW9ucGxhbnM=/2022-05-01.xml
@@ -7,8 +7,8 @@
       <resource id="/subscriptions/{}/providers/microsoft.network/ddosprotectionplans" version="2022-05-01" swagger="mgmt-plane/network/ResourceProviders/Microsoft.Network/Paths/L3N1YnNjcmlwdGlvbnMve3N1YnNjcmlwdGlvbklkfS9wcm92aWRlcnMvTWljcm9zb2Z0Lk5ldHdvcmsvZGRvc1Byb3RlY3Rpb25QbGFucw==/V/MjAyMi0wNS0wMQ=="/>
       <resource id="/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/ddosprotectionplans" version="2022-05-01" swagger="mgmt-plane/network/ResourceProviders/Microsoft.Network/Paths/L3N1YnNjcmlwdGlvbnMve3N1YnNjcmlwdGlvbklkfS9yZXNvdXJjZUdyb3Vwcy97cmVzb3VyY2VHcm91cE5hbWV9L3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9kZG9zUHJvdGVjdGlvblBsYW5z/V/MjAyMi0wNS0wMQ=="/>
       <argGroup name="">
-        <arg type="ResourceGroupName" var="$Path.resourceGroupName" options="resource-group g"/>
-        <arg type="SubscriptionId" var="$Path.subscriptionId" options="subscription" required="True"/>
+        <arg type="ResourceGroupName" var="$Path.resourceGroupName" options="resource-group g" idPart="resource_group"/>
+        <arg type="SubscriptionId" var="$Path.subscriptionId" options="subscription" required="True" idPart="subscription"/>
       </argGroup>
       <condition var="$Condition_DdosProtectionPlans_ListByResourceGroup">
         <operator type="and">
@@ -60,13 +60,13 @@
                           </enum>
                         </prop>
                         <prop readOnly="True" type="array<object>" name="publicIpAddresses">
-                          <item readOnly="True" type="object" cls="SubResource_read">
-                            <prop readOnly="True" type="string" name="id"/>
+                          <item type="object" cls="SubResource_read">
+                            <prop type="string" name="id"/>
                           </item>
                         </prop>
                         <prop readOnly="True" type="string" name="resourceGuid"/>
                         <prop readOnly="True" type="array<@SubResource_read>" name="virtualNetworks">
-                          <item readOnly="True" type="@SubResource_read"/>
+                          <item type="@SubResource_read"/>
                         </prop>
                       </prop>
                       <prop type="object" name="tags">
@@ -125,11 +125,11 @@
                           </enum>
                         </prop>
                         <prop readOnly="True" type="array<@SubResource_read>" name="publicIpAddresses">
-                          <item readOnly="True" type="@SubResource_read"/>
+                          <item type="@SubResource_read"/>
                         </prop>
                         <prop readOnly="True" type="string" name="resourceGuid"/>
                         <prop readOnly="True" type="array<@SubResource_read>" name="virtualNetworks">
-                          <item readOnly="True" type="@SubResource_read"/>
+                          <item type="@SubResource_read"/>
                         </prop>
                       </prop>
                       <prop type="object" name="tags">