Merging the ManagedNetworkFabric changes in RPSaaSMaster into main (A…

…zure#24254) * Merging the RPSaaSMaster PRs into main 1. Azure/azure-rest-api-specs-pr#11537 2. Azure/azure-rest-api-specs-pr#11749 3. Azure/azure-rest-api-specs-pr#12117 * updating swagger-to-sdk in readme.md * Minor changes - to resolve the dotnet and python sdk issues * minor change to resolve the dotnet sdk issue * solved sdk issue having incompatible type for optionB description. * Resolving the Duplicated model name with non-identical definitions issue.
harryli0108 · Jul 28, 2023 · 9f78c20 · 9f78c20
1 parent 0091678
commit 9f78c20
Show file tree

Hide file tree

Showing 53 changed files with 2,728 additions and 1,360 deletions.
diff --git a/...urce-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpCommunities.json b/...urce-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpCommunities.json
diff --git a/...e-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpCommunityLists.json b/...e-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpCommunityLists.json
diff --git a/...iew/2023-02-01-preview/IpPrefixLists.json → ...-02-01-preview/IpExtendedCommunities.json b/...iew/2023-02-01-preview/IpPrefixLists.json → ...-02-01-preview/IpExtendedCommunities.json
diff --git a/...esource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpPrefixes.json b/...esource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpPrefixes.json
diff --git a/...manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/L3IsolationDomains.json b/...manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/L3IsolationDomains.json
@@ -2327,7 +2327,7 @@
         },
         "optionAProperties": {
           "description": "option A properties object",
-          "$ref": "#/definitions/OptionAProperties"
+          "$ref": "#/definitions/Layer3OptionAProperties"
         },
         "importRoutePolicyId": {
           "type": "string",
@@ -2656,7 +2656,7 @@
           "properties": {},
           "allOf": [
             {
-              "$ref": "#/definitions/OptionAProperties"
+              "$ref": "#/definitions/Layer3OptionAProperties"
             }
           ],
           "required": [
@@ -2750,23 +2750,23 @@
       "properties": {
         "primaryIpv4Prefix": {
           "type": "string",
-          "description": "IPv4 Address Prefix of CE-PE interconnect links. Default value is 172.23.1.0/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
+          "description": "IPv4 Address Prefix of CE-PE interconnect links. Example: 172.31.0.0/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
         },
         "primaryIpv6Prefix": {
           "type": "string",
-          "description": "IPv6 Address Prefix of CE-PE interconnect links. Default value is 3FFE:FFFF:0:CD30::a1/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
+          "description": "IPv6 Address Prefix of CE-PE interconnect links. Example: 3FFE:FFFF:0:CD30::a0/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
         },
         "secondaryIpv4Prefix": {
           "type": "string",
-          "description": "Secondary IPv4 Address Prefix of CE-PE interconnect links. Default value is 172.23.1.2/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
+          "description": "Secondary IPv4 Address Prefix of CE-PE interconnect links. Example: 172.31.0.20/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
         },
         "secondaryIpv6Prefix": {
           "type": "string",
-          "description": "Secondary IPv6 Address Prefix of CE-PE interconnect links. Default value is 3FFE:FFFF:0:CD30::a1/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
+          "description": "Secondary IPv6 Address Prefix of CE-PE interconnect links. Example: 3FFE:FFFF:0:CD30::a4/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
         }
       }
     },
-    "OptionAProperties": {
+    "Layer3OptionAProperties": {
       "type": "object",
       "description": "Peering optionA properties",
       "properties": {

diff --git a/...rce-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/NetworkFabrics.json b/...rce-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/NetworkFabrics.json
@@ -836,17 +836,15 @@
         },
         "ipv4Prefix": {
           "type": "string",
-          "description": "IPv4Prefix for Management Network. Default value : 10.1.0.0/19.",
+          "description": "IPv4Prefix for Management Network. Example: 10.1.0.0/19.",
           "x-ms-mutability": [
             "create",
             "read"
-          ],
-          "default": "10.1.0.0/19"
+          ]
         },
         "ipv6Prefix": {
           "type": "string",
-          "description": "IPv6Prefix for Management Network. Default value 3FFE:FFFF:0:CD40::/59.",
-          "default": "3FFE:FFFF:0:CD40::/59",
+          "description": "IPv6Prefix for Management Network. Example: 3FFE:FFFF:0:CD40::/59.",
           "x-ms-mutability": [
             "create",
             "read"
@@ -931,7 +929,7 @@
                 }
               },
               "required": [
-                "optionBProperties"
+                "peeringOption"
               ]
             },
             "workloadVpnConfiguration": {
@@ -960,7 +958,7 @@
                 }
               },
               "required": [
-                "optionBProperties"
+                "peeringOption"
               ]
             }
           }
@@ -1098,6 +1096,19 @@
       "type": "object",
       "description": "Configuration used to setup CE-PE connectivity.",
       "properties": {
+        "nniType": {
+          "type": "string",
+          "description": "Type of NNI used. Example: CE | NPB",
+          "default": "CE",
+          "enum": [
+            "CE",
+            "NPB"
+          ],
+          "x-ms-enum": {
+            "modelAsString": true,
+            "name": "nniType"
+          }
+        },
         "administrativeState": {
           "description": "Gets the administrativeState of the resource. Example -Enabled/Disabled",
           "$ref": "./common.json#/definitions/EnabledDisabledState"
@@ -1169,7 +1180,7 @@
           "format": "int32",
           "minimum": 501,
           "maximum": 4095,
-          "description": "Vlan Id.Example : 501"
+          "description": "Vlan identifier. Example : 501"
         },
         "peerASN": {
           "type": "integer",
@@ -1205,7 +1216,7 @@
     },
     "OptionBProperties": {
       "type": "object",
-      "description": "Option B configuration to be used for management vpn.",
+      "description": "Option B configuration.",
       "properties": {
         "importRouteTargets": {
           "type": "array",
@@ -1307,23 +1318,19 @@
       "properties": {
         "primaryIpv4Prefix": {
           "type": "string",
-          "description": "IPv4 Address Prefix of CE-PE interconnect links. Default value is 172.31.0.0/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces.",
-          "default": "172.31.0.0/31"
+          "description": "IPv4 Address Prefix of CE-PE interconnect links. Example: 172.31.0.0/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
         },
         "primaryIpv6Prefix": {
           "type": "string",
-          "description": "IPv6 Address Prefix of CE-PE interconnect links. Default value is 3FFE:FFFF:0:CD30::a0/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces.",
-          "default": "3FFE:FFFF:0:CD30::a0/126"
+          "description": "IPv6 Address Prefix of CE-PE interconnect links. Example: 3FFE:FFFF:0:CD30::a0/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
         },
         "secondaryIpv4Prefix": {
           "type": "string",
-          "description": "Secondary IPv4 Address Prefix of CE-PE interconnect links. Default value is 172.31.0.20/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces.",
-          "default": "172.31.0.20/31"
+          "description": "Secondary IPv4 Address Prefix of CE-PE interconnect links. Example: 172.31.0.20/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
         },
         "secondaryIpv6Prefix": {
           "type": "string",
-          "description": "Secondary IPv6 Address Prefix of CE-PE interconnect links. Default value is 3FFE:FFFF:0:CD30::a4/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces.",
-          "default": "3FFE:FFFF:0:CD30::a4/126"
+          "description": "Secondary IPv6 Address Prefix of CE-PE interconnect links. Example: 3FFE:FFFF:0:CD30::a4/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
         }
       }
     }